diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json index 86105cf9f6..a1f90ed29e 100644 --- a/Library/_res/BDFDB.data.json +++ b/Library/_res/BDFDB.data.json @@ -1,5 +1,7 @@ { - "PluginNameMap": {}, + "PluginNameMap": { + "OwnerTag": "StaffTag" + }, "LibraryRequires": ["child_process", "electron", "fs", "path", "process", "request"], "DiscordObjects": { "Channel": {"props": ["getRecipientId", "isManaged", "getGuildId"]}, @@ -824,11 +826,6 @@ "settingsToolbar": "settingsToolbar-wu4yfQ", "toolbar": "toolbar-hRzFw-" }, - "OwnerTag": { - "adminIcon": "admin-Kv1Hp_", - "managementIcon": "management-3fF_o8", - "ownerIcon": "owner-FfFh3B-" - }, "PinDMs": { "dragPreview": "dragPreview-nXiByA", "dmChannelPinned": "pinned-0lM4wD", @@ -905,6 +902,11 @@ "timeline": "timeline-UWmgAx", "volumeSlider": "volumeSlider-sR5g00" }, + "StaffTag": { + "adminIcon": "admin-Kv1Hp_", + "managementIcon": "management-3fF_o8", + "ownerIcon": "owner-FfFh3B-" + }, "ThemeRepo": { "dragBar": "dragBar-4FsRaa", "dragCorner": "dragCorner-PgJJk2", @@ -1314,9 +1316,6 @@ "_oldtitlebarenabled": ["OldTitleBar", "oldTitleBarEnabled"], "_oldtitlebarsettingstoolbar": ["OldTitleBar", "settingsToolbar"], "_oldtitlebartoolbar": ["OldTitleBar", "toolbar"], - "_ownertagadminicon": ["OwnerTag", "adminIcon"], - "_ownertagmanagementicon": ["OwnerTag", "managementIcon"], - "_ownertagownericon": ["OwnerTag", "ownerIcon"], "_pindmsdragpreview": ["PinDMs", "dragPreview"], "_pindmsdmchannelpinned": ["PinDMs", "dmChannelPinned"], "_pindmsdmchannelplaceholder": ["PinDMs", "dmChannelPlaceholder"], @@ -1375,6 +1374,9 @@ "_spotifycontrolssong": ["SpotifyControls", "song"], "_spotifycontrolstimeline": ["SpotifyControls", "timeline"], "_spotifycontrolsvolumeslider": ["SpotifyControls", "volumeSlider"], + "_stafftagadminicon": ["StaffTag", "adminIcon"], + "_stafftagmanagementicon": ["StaffTag", "managementIcon"], + "_stafftagownericon": ["StaffTag", "ownerIcon"], "_themerepodragbar": ["ThemeRepo", "dragBar"], "_themerepodragcorner": ["ThemeRepo", "dragCorner"], "_themerepodraginterface": ["ThemeRepo", "dragInterface"], diff --git a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js index 789cfed64a..0e191a9ee0 100644 --- a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js +++ b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js @@ -2,7 +2,7 @@ * @name BadgesEverywhere * @author DevilBro * @authorId 278543574059057154 - * @version 1.6.6 + * @version 1.6.7 * @description Displays Badges (Nitro, Hypesquad, etc...) in the Chat/MemberList/UserPopout * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -17,8 +17,13 @@ module.exports = (_ => { "info": { "name": "BadgesEverywhere", "author": "DevilBro", - "version": "1.6.6", + "version": "1.6.7", "description": "Displays Badges (Nitro, Hypesquad, etc...) in the Chat/MemberList/UserPopout" + }, + "changeLog": { + "fixed": { + "Margin": "Removed Margin which Discord added by itself" + } } }; @@ -233,6 +238,7 @@ module.exports = (_ => { } ${BDFDB.dotCN._badgeseverywherebadge} { height: 17px !important; + margin: 0 !important; } ${BDFDB.dotCN._badgeseverywheresize17} { width: 17px !important; min-width: 17px !important; diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js index 15a5bea242..4fa9ff304b 100644 --- a/Plugins/EditUsers/EditUsers.plugin.js +++ b/Plugins/EditUsers/EditUsers.plugin.js @@ -2,7 +2,7 @@ * @name EditUsers * @author DevilBro * @authorId 278543574059057154 - * @version 4.1.7 + * @version 4.1.8 * @description Allows you to locally edit Users * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -17,12 +17,12 @@ module.exports = (_ => { "info": { "name": "EditUsers", "author": "DevilBro", - "version": "4.1.7", + "version": "4.1.8", "description": "Allows you to locally edit Users" }, "changeLog": { - "fixed": { - "Tags in DMs List": "Fixed overflowing tags in dms turning invisible" + "added": { + "Do not overwrite Server Nicks": "Added options so local usernames never overwrite the server nicknames of users" } } }; @@ -205,8 +205,9 @@ module.exports = (_ => { if (settings.changeInChatWindow && e.methodArguments[0] && e.methodArguments[0].author && changedUsers[e.methodArguments[0].author.id] && this.shouldChangeInChat(e.methodArguments[0].channel_id)) { let data = changedUsers[e.methodArguments[0].author.id]; if (data.name || data.color1) { - let color1 = data.color1 && data.useRoleColor && (BDFDB.LibraryModules.MemberStore.getMember((BDFDB.LibraryModules.ChannelStore.getChannel(e.methodArguments[0].channel_id) || {}).guild_id, e.methodArguments[0].author.id) || {}).colorString || data.color1; - if (data.name) e.returnValue.nick = data.name; + let member = BDFDB.LibraryModules.MemberStore.getMember((BDFDB.LibraryModules.ChannelStore.getChannel(e.methodArguments[0].channel_id) || {}).guild_id, e.methodArguments[0].author.id); + let color1 = data.color1 && data.useRoleColor && member && member.colorString || data.color1; + if (data.name) e.returnValue.nick = data.useServerNick && member && member.nick || data.name; if (color1) e.returnValue.colorString = BDFDB.ColorUtils.convert(BDFDB.ObjectUtils.is(color1) ? color1[0] : color1, "HEX"); } } @@ -256,33 +257,39 @@ module.exports = (_ => { } getSettingsPanel (collapseStates = {}) { - let settingsPanel, settingsItems = []; + let settingsPanel; + return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, { + collapseStates: collapseStates, + children: _ => { + let settingsItems = []; - for (let cat in settingsHeaders) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelList, { - title: settingsHeaders[cat], - dividerBottom: true, - children: Object.keys(settings).filter(key => this.defaults.settings[key].category == cat).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, { - type: "Switch", - plugin: this, - keys: ["settings", key], - label: this.defaults.settings[key].description, - value: settings[key] - })) - })); - settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsItem, { - type: "Button", - color: BDFDB.LibraryComponents.Button.Colors.RED, - label: "Reset all Users", - onClick: _ => { - BDFDB.ModalUtils.confirm(this, this.labels.confirm_resetall, _ => { - BDFDB.DataUtils.remove(this, "users"); - this.forceUpdateAll(); - }); - }, - children: BDFDB.LanguageUtils.LanguageStrings.RESET - })); - - return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems); + for (let cat in settingsHeaders) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelList, { + title: settingsHeaders[cat], + dividerBottom: true, + children: Object.keys(settings).filter(key => this.defaults.settings[key].category == cat).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, { + type: "Switch", + plugin: this, + keys: ["settings", key], + label: this.defaults.settings[key].description, + value: settings[key] + })) + })); + settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsItem, { + type: "Button", + color: BDFDB.LibraryComponents.Button.Colors.RED, + label: "Reset all Users", + onClick: _ => { + BDFDB.ModalUtils.confirm(this, this.labels.confirm_resetall, _ => { + BDFDB.DataUtils.remove(this, "users"); + this.forceUpdateAll(); + }); + }, + children: BDFDB.LanguageUtils.LanguageStrings.RESET + })); + + return settingsItems; + } + }); } onSettingsClosed () { @@ -448,7 +455,7 @@ module.exports = (_ => { if (!e.returnvalue) { e.instance.props.user = this.getUserData(e.instance.props.user.id, true, true); if (data) { - if (data.name) { + if (data.name && !(data.useServerNick && e.instance.props.nickname)) { e.instance.props.nickname = data.name; if (e.instance.props.guildMember) e.instance.props.guildMember = Object.assign({}, e.instance.props.guildMember, {nick: data.name}); } @@ -511,7 +518,10 @@ module.exports = (_ => { if (!e.returnvalue) { e.instance.props.user = this.getUserData(e.instance.props.user.id); let data = changedUsers[e.instance.props.user.id]; - if (data && data.name) e.instance.props.nick = data.name; + if (data && data.name) { + let member = BDFDB.LibraryModules.MemberStore.getMember(BDFDB.LibraryModules.LastGuildStore.getGuildId(), e.instance.props.user.id); + if (!member || !member.nick || !data.useServerNick) e.instance.props.nick = data.name; + } } else { let userName = BDFDB.ReactUtils.findChild(e.returnvalue, {props: [["className", BDFDB.disCN.voicename]]}); @@ -807,7 +817,10 @@ module.exports = (_ => { e.instance.props.user = this.getUserData(e.instance.props.user.id); let data = changedUsers[e.instance.props.user.id]; if (data) { - if (data.name) e.instance.props.nick = data.name; + if (data.name) { + let member = BDFDB.LibraryModules.MemberStore.getMember(e.instance.props.channel.guild_id, e.instance.props.user.id); + if (!member || !member.nick || !data.useServerNick) e.instance.props.nick = data.name; + } if (data.removeStatus || data.status || data.statusEmoji) { e.instance.props.activities = [].concat(e.instance.props.activities).filter(n => n.type != BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS); let activity = this.createCustomStatus(data); @@ -1193,15 +1206,37 @@ module.exports = (_ => { BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.ModalComponents.ModalTabContent, { tab: this.labels.modal_tabheader1, children: [ - BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, { - title: this.labels.modal_username, + BDFDB.ReactUtils.createElement("div", { className: BDFDB.disCN.marginbottom20, - children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, { - value: data.name, - placeholder: member.nick || user.username, - autoFocus: true, - onChange: value => {newData.name = value;} - }) + children: [ + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex, { + className: BDFDB.disCN.marginbottom8, + align: BDFDB.LibraryComponents.Flex.Align.CENTER, + direction: BDFDB.LibraryComponents.Flex.Direction.HORIZONTAL, + children: [ + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormTitle, { + className: BDFDB.disCN.marginreset, + tag: BDFDB.LibraryComponents.FormComponents.FormTitle.Tags.H5, + children: this.labels.modal_username + }), + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsItem, { + type: "Switch", + margin: 0, + grow: 0, + label: this.labels.modal_useservernick, + tag: BDFDB.LibraryComponents.FormComponents.FormTitle.Tags.H5, + value: data.useServerNick, + onChange: value => {newData.useServerNick = value} + }) + ] + }), + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, { + value: data.name, + placeholder: member.nick || user.username, + autoFocus: true, + onChange: value => {newData.name = value;} + }) + ] }), BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, { title: this.labels.modal_usertag, @@ -1495,6 +1530,7 @@ module.exports = (_ => { modal_username: "Локално потребителско име", modal_userolecolor: "Не презаписвайте цвета на ролята", modal_usertag: "Етикет", + modal_useservernick: "Не презаписвайте псевдонимите", submenu_resetsettings: "Нулиране на потребителя", submenu_usersettings: "Промяна на настройките" }; @@ -1519,6 +1555,7 @@ module.exports = (_ => { modal_username: "Lokalt brugernavn", modal_userolecolor: "Overskriv ikke rollefarven", modal_usertag: "Tag", + modal_useservernick: "Overskriv ikke kælenavne", submenu_resetsettings: "Nulstil bruger", submenu_usersettings: "Ændre indstillinger" }; @@ -1543,6 +1580,7 @@ module.exports = (_ => { modal_username: "Lokaler Benutzername", modal_userolecolor: "Rollenfarbe nicht überschreiben", modal_usertag: "Etikett", + modal_useservernick: "Nicknamen nicht überschreiben", submenu_resetsettings: "Benutzer zurücksetzen", submenu_usersettings: "Einstellungen ändern" }; @@ -1567,6 +1605,7 @@ module.exports = (_ => { modal_username: "Τοπικό όνομα χρήστη", modal_userolecolor: "Μην αντικαθιστάτε το χρώμα του ρόλου", modal_usertag: "Ετικέτα", + modal_useservernick: "Μην αντικαθιστάτε ψευδώνυμα", submenu_resetsettings: "Επαναφορά χρήστη", submenu_usersettings: "Αλλαξε ρυθμίσεις" }; @@ -1591,6 +1630,7 @@ module.exports = (_ => { modal_username: "Nombre de usuario local", modal_userolecolor: "No sobrescriba el color de la función", modal_usertag: "Etiqueta", + modal_useservernick: "No sobrescriba los apodos", submenu_resetsettings: "Restablecer usuario", submenu_usersettings: "Cambiar ajustes" }; @@ -1615,6 +1655,7 @@ module.exports = (_ => { modal_username: "Paikallinen käyttäjätunnus", modal_userolecolor: "Älä korvaa roolin väriä", modal_usertag: "Tag", + modal_useservernick: "Älä korvaa lempinimiä", submenu_resetsettings: "Nollaa käyttäjä", submenu_usersettings: "Vaihda asetuksia" }; @@ -1639,6 +1680,7 @@ module.exports = (_ => { modal_username: "Nom local d'utilisateur", modal_userolecolor: "Ne pas écraser la couleur du rôle", modal_usertag: "Marque", + modal_useservernick: "Ne pas écraser les surnoms", submenu_resetsettings: "Réinitialiser l'utilisateur", submenu_usersettings: "Modifier les paramètres" }; @@ -1663,6 +1705,7 @@ module.exports = (_ => { modal_username: "Lokalno korisničko ime", modal_userolecolor: "Nemojte prebrisati boju uloge", modal_usertag: "Označiti", + modal_useservernick: "Ne prepisujte nadimke", submenu_resetsettings: "Resetiraj korisnika", submenu_usersettings: "Promijeniti postavke" }; @@ -1687,6 +1730,7 @@ module.exports = (_ => { modal_username: "Helyi felhasználónév", modal_userolecolor: "Ne írja felül a Szerepszínt", modal_usertag: "Címke", + modal_useservernick: "Ne írja felül a beceneveket", submenu_resetsettings: "Felhasználó visszaállítása", submenu_usersettings: "Beállítások megváltoztatása" }; @@ -1711,6 +1755,7 @@ module.exports = (_ => { modal_username: "Nome utente locale", modal_userolecolor: "Non sovrascrivere il colore del ruolo", modal_usertag: "Etichetta", + modal_useservernick: "Non sovrascrivere i soprannomi", submenu_resetsettings: "Reimposta utente", submenu_usersettings: "Cambia impostazioni" }; @@ -1735,6 +1780,7 @@ module.exports = (_ => { modal_username: "ローカルユーザー名", modal_userolecolor: "役割の色を上書きしないでください", modal_usertag: "鬼ごっこ", + modal_useservernick: "ニックネームを上書きしないでください", submenu_resetsettings: "ユーザーのリセット", submenu_usersettings: "設定を変更する" }; @@ -1759,6 +1805,7 @@ module.exports = (_ => { modal_username: "로컬 사용자 이름", modal_userolecolor: "역할 색상을 덮어 쓰지 마십시오.", modal_usertag: "꼬리표", + modal_useservernick: "별명을 덮어 쓰지 마십시오", submenu_resetsettings: "사용자 재설정", submenu_usersettings: "설정 변경" }; @@ -1783,6 +1830,7 @@ module.exports = (_ => { modal_username: "Vietinis vartotojo vardas", modal_userolecolor: "Neperrašykite vaidmens spalvos", modal_usertag: "Žyma", + modal_useservernick: "Neperrašykite slapyvardžių", submenu_resetsettings: "Iš naujo nustatyti vartotoją", submenu_usersettings: "Pakeisti nustatymus" }; @@ -1807,6 +1855,7 @@ module.exports = (_ => { modal_username: "Lokale gebruikersnaam", modal_userolecolor: "Overschrijf de rolkleur niet", modal_usertag: "Label", + modal_useservernick: "Overschrijf geen bijnamen", submenu_resetsettings: "Gebruiker resetten", submenu_usersettings: "Instellingen veranderen" }; @@ -1831,6 +1880,7 @@ module.exports = (_ => { modal_username: "Lokalt brukernavn", modal_userolecolor: "Ikke skriv rollefargen", modal_usertag: "Stikkord", + modal_useservernick: "Ikke overskriv kallenavn", submenu_resetsettings: "Tilbakestill bruker", submenu_usersettings: "Endre innstillinger" }; @@ -1855,6 +1905,7 @@ module.exports = (_ => { modal_username: "Lokalna nazwa użytkownika", modal_userolecolor: "Nie zastępuj koloru roli", modal_usertag: "Etykietka", + modal_useservernick: "Nie nadpisuj pseudonimów", submenu_resetsettings: "Resetuj użytkownika", submenu_usersettings: "Zmień ustawienia" }; @@ -1879,6 +1930,7 @@ module.exports = (_ => { modal_username: "Nome de usuário local", modal_userolecolor: "Não sobrescreva a Cor da Função", modal_usertag: "Tag", + modal_useservernick: "Não sobrescrever apelidos", submenu_resetsettings: "Reiniciar usuário", submenu_usersettings: "Mudar configurações" }; @@ -1903,6 +1955,7 @@ module.exports = (_ => { modal_username: "Nume utilizator local", modal_userolecolor: "Nu suprascrieți culoarea rolului", modal_usertag: "Etichetă", + modal_useservernick: "Nu suprascrieți porecle", submenu_resetsettings: "Resetați utilizatorul", submenu_usersettings: "Schimbă setările" }; @@ -1927,6 +1980,7 @@ module.exports = (_ => { modal_username: "Локальное имя пользователя", modal_userolecolor: "Не перезаписывайте цвет роли", modal_usertag: "Тег", + modal_useservernick: "Не перезаписывать никнеймы", submenu_resetsettings: "Сбросить пользователя", submenu_usersettings: "Изменить настройки" }; @@ -1951,6 +2005,7 @@ module.exports = (_ => { modal_username: "Lokalt användarnamn", modal_userolecolor: "Skriv inte över rollfärgen", modal_usertag: "Märka", + modal_useservernick: "Skriv inte över smeknamn", submenu_resetsettings: "Återställ användare", submenu_usersettings: "Ändra inställningar" }; @@ -1975,6 +2030,7 @@ module.exports = (_ => { modal_username: "ชื่อผู้ใช้ท้องถิ่น", modal_userolecolor: "อย่าเขียนทับสีของบทบาท", modal_usertag: "แท็ก", + modal_useservernick: "อย่าเขียนทับชื่อเล่น", submenu_resetsettings: "รีเซ็ตผู้ใช้", submenu_usersettings: "เปลี่ยนการตั้งค่า" }; @@ -1999,6 +2055,7 @@ module.exports = (_ => { modal_username: "Yerel Kullanıcı Adı", modal_userolecolor: "Rol Renginin üzerine yazmayın", modal_usertag: "Etiket", + modal_useservernick: "Takma adların üzerine yazmayın", submenu_resetsettings: "Kullanıcıyı Sıfırla", submenu_usersettings: "Ayarları değiştir" }; @@ -2023,6 +2080,7 @@ module.exports = (_ => { modal_username: "Локальне ім’я користувача", modal_userolecolor: "Не перезаписуйте колір ролі", modal_usertag: "Позначка", + modal_useservernick: "Не перезаписуйте псевдоніми", submenu_resetsettings: "Скинути налаштування користувача", submenu_usersettings: "Змінити налаштування" }; @@ -2047,6 +2105,7 @@ module.exports = (_ => { modal_username: "Tên người dùng cục bộ", modal_userolecolor: "Không ghi đè Màu vai trò", modal_usertag: "Nhãn", + modal_useservernick: "Không ghi đè biệt hiệu", submenu_resetsettings: "Đặt lại người dùng", submenu_usersettings: "Thay đổi cài đặt" }; @@ -2071,6 +2130,7 @@ module.exports = (_ => { modal_username: "本地用户名", modal_userolecolor: "不要覆盖角色颜色", modal_usertag: "标签", + modal_useservernick: "不要覆盖昵称", submenu_resetsettings: "重置用户", submenu_usersettings: "更改设置" }; @@ -2095,6 +2155,7 @@ module.exports = (_ => { modal_username: "本地用戶名", modal_userolecolor: "不要覆蓋角色顏色", modal_usertag: "標籤", + modal_useservernick: "不要覆蓋暱稱", submenu_resetsettings: "重置用戶", submenu_usersettings: "更改設置" }; @@ -2119,6 +2180,7 @@ module.exports = (_ => { modal_username: "Local Username", modal_userolecolor: "Do not overwrite the Role Color", modal_usertag: "Tag", + modal_useservernick: "Do not overwrite Nicknames", submenu_resetsettings: "Reset User", submenu_usersettings: "Change Settings" }; diff --git a/Plugins/OldTitleBar/OldTitleBar.plugin.js b/Plugins/OldTitleBar/OldTitleBar.plugin.js index 313cf70b84..c708342b1e 100644 --- a/Plugins/OldTitleBar/OldTitleBar.plugin.js +++ b/Plugins/OldTitleBar/OldTitleBar.plugin.js @@ -3,7 +3,7 @@ * @author DevilBro * @authorId 278543574059057154 * @version 1.6.9 - * @description Allows you to switch to Discord's old Titlebar or add the native OS Titlebar + * @description Allows you to switch to Discord's old Titlebar * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien * @patreon https://www.patreon.com/MircoWittrien @@ -18,7 +18,7 @@ module.exports = (_ => { "name": "OldTitleBar", "author": "DevilBro", "version": "1.6.9", - "description": "Allows you to switch to Discord's old Titlebar or add the native OS Titlebar" + "description": "Allows you to switch to Discord's old Titlebar" } }; diff --git a/Plugins/OldTitleBar/README.md b/Plugins/OldTitleBar/README.md index 02295571b9..d5c985c0c4 100644 --- a/Plugins/OldTitleBar/README.md +++ b/Plugins/OldTitleBar/README.md @@ -9,4 +9,4 @@ [patreon-badge]: https://img.shields.io/badge/Patreon-Support!-%23F96854.svg?logo=patreon&style=flat [patreon-link]: https://patreon.com/MircoWittrien -Allows you to switch to Discord's old Titlebar or add the native OS Titlebar +Allows you to switch to Discord's old Titlebar diff --git a/Plugins/PluginRepo/_res/PluginList.txt b/Plugins/PluginRepo/_res/PluginList.txt index decfa138ea..0840d6c530 100644 --- a/Plugins/PluginRepo/_res/PluginList.txt +++ b/Plugins/PluginRepo/_res/PluginList.txt @@ -81,7 +81,6 @@ https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/L https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/MessageUtilities/MessageUtilities.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/NotificationSounds/NotificationSounds.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/OldTitleBar/OldTitleBar.plugin.js -https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/OwnerTag/OwnerTag.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/PersonalPins/PersonalPins.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/PinDMs/PinDMs.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/PluginRepo/PluginRepo.plugin.js @@ -98,6 +97,7 @@ https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/S https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/ShowHiddenChannels/ShowHiddenChannels.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/SpellCheck/SpellCheck.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/SpotifyControls/SpotifyControls.plugin.js +https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/StaffTag/StaffTag.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/SteamProfileLink/SteamProfileLink.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/ThemeRepo/ThemeRepo.plugin.js https://raw.githubusercontent.com/mwittrien/BetterDiscordAddons/master/Plugins/ThemeSettings/ThemeSettings.plugin.js @@ -109,6 +109,7 @@ https://raw.githubusercontent.com/noodlebox/betterdiscord-plugins/master/StaticA https://raw.githubusercontent.com/Orrielel/BetterDiscordAddons/master/Plugins/BetterImagePopups/BetterImagePopups.plugin.js https://raw.githubusercontent.com/planetarian/BetterDiscordPlugins/master/DefaultChannels.plugin.js https://raw.githubusercontent.com/planetarian/BetterDiscordPlugins/master/Zalgo.plugin.js +https://raw.githubusercontent.com/QWERTxD/BetterDiscordPlugins/main/ClickToCopyUsername/ClickToCopyUsername.plugin.js https://raw.githubusercontent.com/QWERTxD/BetterDiscordPlugins/main/DndWhilePlaying/DndWhilePlaying.plugin.js https://raw.githubusercontent.com/QWERTxD/BetterDiscordPlugins/main/QuickMessages/QuickMessages.plugin.js https://raw.githubusercontent.com/rauenzi/BDPluginLibrary/master/release/0PluginLibrary.plugin.js diff --git a/Plugins/README.md b/Plugins/README.md index d12ed1b77d..7b62f713ef 100644 --- a/Plugins/README.md +++ b/Plugins/README.md @@ -35,8 +35,7 @@ - [Last Message Date](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/LastMessageDate) - Displays the Last Message Date of a Member for the current Server/DM in the UserPopout and UserModal - [Message Utilities](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/MessageUtilities) - Adds several Quick Actions for Messages (Delete, Edit, Pin, etc.) - [Notification Sounds](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/NotificationSounds) - Allows you to replace the native Sounds with custom Sounds - - [Old Title Bar](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/OldTitleBar) - Allows you to switch to Discord's old Titlebar or add the native OS Titlebar - - [Owner Tag](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/OwnerTag) - Adds a Tag/Crown to Server Owners (or Admins/Management) + - [Old Title Bar](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/OldTitleBar) - Allows you to switch to Discord's old Titlebar - [Personal Pins](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/PersonalPins) - Allows you to locally pin Messages - [Pin DMs](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/PinDMs) - Allows you to pin DMs, making them appear at the top of your DMs/ServerList - [Quick Mention](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/QuickMention) - Adds a Mention Button to the Message Options Bar @@ -52,6 +51,7 @@ - [Show Hidden Channels](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ShowHiddenChannels) - Displays all hidden Channels, which can't be accessed due to Role Restrictions, this won't allow you to read them (impossible) - [Spell Check](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/SpellCheck) - Adds a Spell Check to all Message Inputs - [Spotify Controls](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/SpotifyControls) - Adds a Control Panel while listening to Spotify on a connected Account + - [Staff Tag](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/StaffTag) - Adds a Tag/Crown to Server Owners (or Admins/Management) - [Steam Profile Link](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/SteamProfileLink) - Opens Steam Links in Steam instead of your Browser - [Theme Settings](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ThemeSettings) - Allows you to change Theme Variables within Discord - [Timed Light Dark Mode](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/TimedLightDarkMode) - Adds a Time Slider to the Appearance Settings diff --git a/Plugins/OwnerTag/README.md b/Plugins/StaffTag/README.md similarity index 96% rename from Plugins/OwnerTag/README.md rename to Plugins/StaffTag/README.md index 78354a5235..890c5a4a40 100644 --- a/Plugins/OwnerTag/README.md +++ b/Plugins/StaffTag/README.md @@ -1,7 +1,7 @@ -# Owner Tag - [![Downlad][download-badge]][download-link] [![Paypal][paypal-badge]][paypal-link] [![Patreon][patreon-badge]][patreon-link] +# Staff Tag - [![Downlad][download-badge]][download-link] [![Paypal][paypal-badge]][paypal-link] [![Patreon][patreon-badge]][patreon-link] [download-badge]: https://img.shields.io/badge/Download-Plugin-brightgreen.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADGGlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjaY2BgnuDo4uTKJMDAUFBUUuQe5BgZERmlwH6egY2BmYGBgYGBITG5uMAxIMCHgYGBIS8/L5UBFTAyMHy7xsDIwMDAcFnX0cXJlYE0wJpcUFTCwMBwgIGBwSgltTiZgYHhCwMDQ3p5SUEJAwNjDAMDg0hSdkEJAwNjAQMDg0h2SJAzAwNjCwMDE09JakUJAwMDg3N+QWVRZnpGiYKhpaWlgmNKflKqQnBlcUlqbrGCZ15yflFBflFiSWoKAwMD1A4GBgYGXpf8EgX3xMw8BSMDVQYqg4jIKAUICxE+CDEESC4tKoMHJQODAIMCgwGDA0MAQyJDPcMChqMMbxjFGV0YSxlXMN5jEmMKYprAdIFZmDmSeSHzGxZLlg6WW6x6rK2s99gs2aaxfWMPZ9/NocTRxfGFM5HzApcj1xZuTe4FPFI8U3mFeCfxCfNN45fhXyygI7BD0FXwilCq0A/hXhEVkb2i4aJfxCaJG4lfkaiQlJM8JpUvLS19QqZMVl32llyfvIv8H4WtioVKekpvldeqFKiaqP5UO6jepRGqqaT5QeuA9iSdVF0rPUG9V/pHDBYY1hrFGNuayJsym740u2C+02KJ5QSrOutcmzjbQDtXe2sHY0cdJzVnJRcFV3k3BXdlD3VPXS8Tbxsfd99gvwT//ID6wIlBS4N3hVwMfRnOFCEXaRUVEV0RMzN2T9yDBLZE3aSw5IaUNak30zkyLDIzs+ZmX8xlz7PPryjYVPiuWLskq3RV2ZsK/cqSql01jLVedVPrHzbqNdU0n22VaytsP9op3VXUfbpXta+x/+5Em0mzJ/+dGj/t8AyNmf2zvs9JmHt6vvmCpYtEFrcu+bYsc/m9lSGrTq9xWbtvveWGbZtMNm/ZarJt+w6rnft3u+45uy9s/4ODOYd+Hmk/Jn58xUnrU+fOJJ/9dX7SRe1LR68kXv13fc5Nm1t379TfU75/4mHeY7En+59lvhB5efB1/lv5dxc+NH0y/fzq64Lv4T8Ffp360/rP8f9/AA0ADzT6lvFdAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAF1SURBVHja7JihTgNBEIb/K1WkBtEEAsESBKEvgEKRAhLHOxAMfQ9cHwEMBoFA1/ACBEGgzbkmUAwI+BENubTs9WZmLz1CZtZd9v7/u9vMZGdAGFabA05Hn3sWrYQwRB9rwafreikbQN5LiV6qhorDARzAARzAARzAARzAARzAARygGOAQ6a+GLr9jmlwpDuJbsxQrER+YYrXaI2D8EZyAEfangj2Fq0NrnBWry8YI5yb7rkRbBrDAK7X9NevlAYCL7Kns79iQKcunOU0+iO0fuSzV1QyUNjkU2b9wS66qm2nt8L3Q/oO7Gk3tWO2InzPtv3isU9RP9jqxmR8LMKsqdPVqFoC8qiDM/HiAcFUQZ34IYDr0VUGW+QEfK8BkVZBmfqkAWVWQZ37JAOA+n/nEtnh/wGd8JWP81Nt0P0r8Wu4ADvAHAOq2fsaP4N8BvFXi/ZoB3FYCcJMNKDbQw9Kc7YdoYfDzB+6xjUuM5mY+wsXYHvgeABIzsPkSOM/lAAAAAElFTkSuQmCC&style=flat -[download-link]: https://mwittrien.github.io/downloader/?plugin=OwnerTag +[download-link]: https://mwittrien.github.io/downloader/?plugin=StaffTag [paypal-badge]: https://img.shields.io/badge/Paypal-Donate!-%23003087.svg?logo=paypal&style=flat [paypal-link]: https://paypal.me/MircoWittrien diff --git a/Plugins/OwnerTag/OwnerTag.plugin.js b/Plugins/StaffTag/StaffTag.plugin.js similarity index 94% rename from Plugins/OwnerTag/OwnerTag.plugin.js rename to Plugins/StaffTag/StaffTag.plugin.js index 95cef5a03e..d7f02735c9 100644 --- a/Plugins/OwnerTag/OwnerTag.plugin.js +++ b/Plugins/StaffTag/StaffTag.plugin.js @@ -1,28 +1,28 @@ /** - * @name OwnerTag + * @name StaffTag * @author DevilBro * @authorId 278543574059057154 - * @version 1.3.9 + * @version 1.4.0 * @description Adds a Tag/Crown to Server Owners (or Admins/Management) * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien * @patreon https://www.patreon.com/MircoWittrien * @website https://mwittrien.github.io/ - * @source https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/OwnerTag/ - * @updateUrl https://mwittrien.github.io/BetterDiscordAddons/Plugins/OwnerTag/OwnerTag.plugin.js + * @source https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/StaffTag/ + * @updateUrl https://mwittrien.github.io/BetterDiscordAddons/Plugins/StaffTag/StaffTag.plugin.js */ module.exports = (_ => { const config = { "info": { - "name": "OwnerTag", + "name": "StaffTag", "author": "DevilBro", - "version": "1.3.9", + "version": "1.4.0", "description": "Adds a Tag/Crown to Server Owners (or Admins/Management)" }, "changeLog": { - "added": { - "New Settings": "Added new tag options for Management (Users/Messages) and restructured the Settings so you might need to reconfigure some stuff" + "progress": { + "New Plugin Name": "Changed Plugin Name for more clarity" } } }; @@ -72,7 +72,7 @@ module.exports = (_ => { OWNER: 3 }; - return class OwnerTag extends Plugin { + return class StaffTag extends Plugin { onLoad () { this.patchedModules = { after: { @@ -115,10 +115,10 @@ module.exports = (_ => { }; this.css = ` - ${BDFDB.dotCN.memberownericon + BDFDB.dotCN._ownertagadminicon} { + ${BDFDB.dotCN.memberownericon + BDFDB.dotCN._stafftagadminicon} { color: #aaa9ad; } - ${BDFDB.dotCN.memberownericon + BDFDB.dotCN._ownertagmanagementicon} { + ${BDFDB.dotCN.memberownericon + BDFDB.dotCN._stafftagmanagementicon} { color: #88540b; } ${BDFDB.dotCNS.message + BDFDB.dotCN.memberownericon} { @@ -225,7 +225,7 @@ module.exports = (_ => { processMemberListItem (e) { let userType = this.getUserType(e.instance.props.user, e.instance.props.channel && e.instance.props.channel.id); if (userType && this.settings.tagPlaces.memberList) { - this.injectOwnerTag(BDFDB.ObjectUtils.get(e.returnvalue, "props.decorators.props.children"), e.instance.props.user, userType, 1, { + this.injectStaffTag(BDFDB.ObjectUtils.get(e.returnvalue, "props.decorators.props.children"), e.instance.props.user, userType, 1, { channelId: e.instance.props.channel && e.instance.props.channel.id, tagClass: BDFDB.disCN.bottagmember }); @@ -235,7 +235,7 @@ module.exports = (_ => { processMessageUsername (e) { if (e.instance.props.message && this.settings.tagPlaces.chat) { let userType = this.getUserType(e.instance.props.message.author, e.instance.props.message.channel_id); - if (userType) this.injectOwnerTag(e.returnvalue.props.children, e.instance.props.message.author, userType, e.instance.props.compact ? 0 : 2, { + if (userType) this.injectStaffTag(e.returnvalue.props.children, e.instance.props.message.author, userType, e.instance.props.compact ? 0 : 2, { channelId: e.instance.props.message.channel_id, tagClass: e.instance.props.compact ? BDFDB.disCN.messagebottagcompact : BDFDB.disCN.messagebottagcozy, useRem: true @@ -248,7 +248,7 @@ module.exports = (_ => { let userType = this.getUserType(e.instance.props.user, e.instance.props.channel && e.instance.props.channel.id); if (userType) { let content = BDFDB.ReactUtils.findChild(e.returnvalue, {props: [["className", BDFDB.disCN.voicecontent]]}); - if (content) this.injectOwnerTag(content.props.children, e.instance.props.user, userType, 3, { + if (content) this.injectStaffTag(content.props.children, e.instance.props.user, userType, 3, { channelId: e.instance.props.channel && e.instance.props.channel.id, }); } @@ -270,7 +270,7 @@ module.exports = (_ => { tagClass = BDFDB.disCNS.userprofilebottag + BDFDB.disCN.bottagnametag; break; } - if (inject) this.injectOwnerTag(e.returnvalue.props.children, e.instance.props.user, userType, 2, { + if (inject) this.injectStaffTag(e.returnvalue.props.children, e.instance.props.user, userType, 2, { tagClass: tagClass, useRem: e.instance.props.useRemSizes, inverted: e.instance.props.invertBotTagColor @@ -284,7 +284,7 @@ module.exports = (_ => { let userType = this.getUserType(e.instance.props.user, e.instance.props.channel && e.instance.props.channel.id); if (userType) { let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadertagwithnickname]]}); - if (index > -1) this.injectOwnerTag(children, e.instance.props.user, userType, 2, { + if (index > -1) this.injectStaffTag(children, e.instance.props.user, userType, 2, { tagClass: BDFDB.disCNS.userpopoutheaderbottagwithnickname + BDFDB.disCN.bottagnametag, inverted: typeof e.instance.getMode == "function" && e.instance.getMode() !== "Normal" }); @@ -292,7 +292,7 @@ module.exports = (_ => { } } - injectOwnerTag (children, user, userType, insertIndex, config = {}) { + injectStaffTag (children, user, userType, insertIndex, config = {}) { if (!BDFDB.ArrayUtils.is(children) || !user) return; let [_, index] = BDFDB.ReactUtils.findParent(children, {props: [["text", [BDFDB.LanguageUtils.LanguageStrings.GROUP_OWNER, BDFDB.LanguageUtils.LanguageStrings.GUILD_OWNER]]]}); if (index > -1) children[index] = null; @@ -304,15 +304,15 @@ module.exports = (_ => { switch (userType) { case userTypes.OWNER: label = channel && channel.isGroupDM() ? BDFDB.LanguageUtils.LanguageStrings.GROUP_OWNER : BDFDB.LanguageUtils.LanguageStrings.GUILD_OWNER; - className = BDFDB.disCN._ownertagownericon; + className = BDFDB.disCN._stafftagownericon; break; case userTypes.ADMIN: label = BDFDB.LanguageUtils.LanguageStrings.ADMINISTRATOR; - className = BDFDB.disCN._ownertagadminicon; + className = BDFDB.disCN._stafftagadminicon; break; case userTypes.MANAGEMENT: label = `${this.labels.management} (${this.getManagementLabel(user)})`; - className = BDFDB.disCN._ownertagmanagementicon; + className = BDFDB.disCN._stafftagmanagementicon; break; } tag = BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { diff --git a/Plugins/OwnerTag/_res/cover.png b/Plugins/StaffTag/_res/cover.png similarity index 100% rename from Plugins/OwnerTag/_res/cover.png rename to Plugins/StaffTag/_res/cover.png diff --git a/Plugins/OwnerTag/_res/screenshot1.png b/Plugins/StaffTag/_res/screenshot1.png similarity index 100% rename from Plugins/OwnerTag/_res/screenshot1.png rename to Plugins/StaffTag/_res/screenshot1.png diff --git a/Plugins/OwnerTag/_res/screenshot2.png b/Plugins/StaffTag/_res/screenshot2.png similarity index 100% rename from Plugins/OwnerTag/_res/screenshot2.png rename to Plugins/StaffTag/_res/screenshot2.png diff --git a/Plugins/OwnerTag/_res/screenshot3.png b/Plugins/StaffTag/_res/screenshot3.png similarity index 100% rename from Plugins/OwnerTag/_res/screenshot3.png rename to Plugins/StaffTag/_res/screenshot3.png diff --git a/Plugins/OwnerTag/_res/screenshot4.png b/Plugins/StaffTag/_res/screenshot4.png similarity index 100% rename from Plugins/OwnerTag/_res/screenshot4.png rename to Plugins/StaffTag/_res/screenshot4.png