stuff
This commit is contained in:
parent
8d32a23c57
commit
279ae7f302
|
@ -1271,6 +1271,7 @@
|
||||||
"MessageTimestamp",
|
"MessageTimestamp",
|
||||||
"NameTag",
|
"NameTag",
|
||||||
"NowPlayingItem",
|
"NowPlayingItem",
|
||||||
|
"PendingRow",
|
||||||
"PeopleListSectionedLazy",
|
"PeopleListSectionedLazy",
|
||||||
"PictureInPictureVideo",
|
"PictureInPictureVideo",
|
||||||
"PrivateChannelEmptyMessage",
|
"PrivateChannelEmptyMessage",
|
||||||
|
@ -4333,6 +4334,7 @@
|
||||||
size24: "size24-NlR6be"
|
size24: "size24-NlR6be"
|
||||||
};
|
};
|
||||||
DiscordClassModules.BetterFriendList = {
|
DiscordClassModules.BetterFriendList = {
|
||||||
|
mutualGuilds: "mutualGuilds-s7F2aa",
|
||||||
nameCell: "nameCell-7F4sRs",
|
nameCell: "nameCell-7F4sRs",
|
||||||
title: "title-3aDrFs"
|
title: "title-3aDrFs"
|
||||||
},
|
},
|
||||||
|
@ -4664,7 +4666,7 @@
|
||||||
DiscordClassModules.NoteTextarea = BDFDB.ModuleUtils.find(m => typeof m.textarea == "string" && Object.keys(m).length == 1);
|
DiscordClassModules.NoteTextarea = BDFDB.ModuleUtils.find(m => typeof m.textarea == "string" && Object.keys(m).length == 1);
|
||||||
DiscordClassModules.Notice = BDFDB.ModuleUtils.findByProperties("notice", "noticeFacebook");
|
DiscordClassModules.Notice = BDFDB.ModuleUtils.findByProperties("notice", "noticeFacebook");
|
||||||
DiscordClassModules.PeopleItem = BDFDB.ModuleUtils.findByProperties("peopleListItem", "active");
|
DiscordClassModules.PeopleItem = BDFDB.ModuleUtils.findByProperties("peopleListItem", "active");
|
||||||
DiscordClassModules.PeopleItemInfo = BDFDB.ModuleUtils.findByProperties("actions", "mutualGuilds", "userInfo");
|
DiscordClassModules.PeopleItemInfo = BDFDB.ModuleUtils.find(m => typeof m.listItemContents == "string" && typeof m.actions == "string" && Object.keys(m).length == 2);
|
||||||
DiscordClassModules.Peoples = BDFDB.ModuleUtils.findByProperties("peopleColumn", "tabBar");
|
DiscordClassModules.Peoples = BDFDB.ModuleUtils.findByProperties("peopleColumn", "tabBar");
|
||||||
DiscordClassModules.PictureInPicture = BDFDB.ModuleUtils.findByProperties("pictureInPicture", "pictureInPictureWindow");
|
DiscordClassModules.PictureInPicture = BDFDB.ModuleUtils.findByProperties("pictureInPicture", "pictureInPictureWindow");
|
||||||
DiscordClassModules.PillWrapper = BDFDB.ModuleUtils.find(m => typeof m.item == "string" && typeof m.wrapper == "string" && Object.keys(m).length == 2);
|
DiscordClassModules.PillWrapper = BDFDB.ModuleUtils.find(m => typeof m.item == "string" && typeof m.wrapper == "string" && Object.keys(m).length == 2);
|
||||||
|
@ -4750,6 +4752,7 @@
|
||||||
_badgeseverywheresize21: ["BadgesEverywhere", "size21"],
|
_badgeseverywheresize21: ["BadgesEverywhere", "size21"],
|
||||||
_badgeseverywheresize22: ["BadgesEverywhere", "size22"],
|
_badgeseverywheresize22: ["BadgesEverywhere", "size22"],
|
||||||
_badgeseverywheresize24: ["BadgesEverywhere", "size24"],
|
_badgeseverywheresize24: ["BadgesEverywhere", "size24"],
|
||||||
|
_betterfriendlistmutualguilds: ["BetterFriendList", "mutualGuilds"],
|
||||||
_betterfriendlistnamecell: ["BetterFriendList", "nameCell"],
|
_betterfriendlistnamecell: ["BetterFriendList", "nameCell"],
|
||||||
_betterfriendlisttitle: ["BetterFriendList", "title"],
|
_betterfriendlisttitle: ["BetterFriendList", "title"],
|
||||||
_betternsfwtagtag: ["BetterNsfwTag", "nsfwTag"],
|
_betternsfwtagtag: ["BetterNsfwTag", "nsfwTag"],
|
||||||
|
@ -5866,9 +5869,7 @@
|
||||||
paginationlistmini: ["BDFDB", "paginationListMini"],
|
paginationlistmini: ["BDFDB", "paginationListMini"],
|
||||||
paginationlistpagination: ["BDFDB", "paginationListPagination"],
|
paginationlistpagination: ["BDFDB", "paginationListPagination"],
|
||||||
peopleactions: ["PeopleItemInfo", "actions"],
|
peopleactions: ["PeopleItemInfo", "actions"],
|
||||||
peopleinfo: ["PeopleItemInfo", "userInfo"],
|
|
||||||
peopleinner: ["PeopleItemInfo", "listItemContents"],
|
peopleinner: ["PeopleItemInfo", "listItemContents"],
|
||||||
peoplemutualguilds: ["PeopleItemInfo", "mutualGuilds"],
|
|
||||||
peoples: ["Peoples", "container"],
|
peoples: ["Peoples", "container"],
|
||||||
peoplesbadge: ["Peoples", "badge"],
|
peoplesbadge: ["Peoples", "badge"],
|
||||||
peoplesnowplayingcolumn: ["Peoples", "nowPlayingColumn"],
|
peoplesnowplayingcolumn: ["Peoples", "nowPlayingColumn"],
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -16,7 +16,7 @@ var BetterFriendList = (_ => {
|
||||||
return class BetterFriendList {
|
return class BetterFriendList {
|
||||||
getName () {return "BetterFriendList";}
|
getName () {return "BetterFriendList";}
|
||||||
|
|
||||||
getVersion () {return "1.2.7";}
|
getVersion () {return "1.2.8";}
|
||||||
|
|
||||||
getAuthor () {return "DevilBro";}
|
getAuthor () {return "DevilBro";}
|
||||||
|
|
||||||
|
@ -28,6 +28,16 @@ var BetterFriendList = (_ => {
|
||||||
searchQuery = "";
|
searchQuery = "";
|
||||||
|
|
||||||
this.css = `
|
this.css = `
|
||||||
|
${BDFDB.dotCN.peoplewrapper} > * {
|
||||||
|
justify-content: unset;
|
||||||
|
}
|
||||||
|
${BDFDB.dotCNS.peoplewrapper + BDFDB.dotCN.userinfo} {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
${BDFDB.dotCN._betterfriendlistmutualguilds} {
|
||||||
|
margin-left: 13px;
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
${BDFDB.dotCN._betterfriendlisttitle} {
|
${BDFDB.dotCN._betterfriendlisttitle} {
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +50,8 @@ var BetterFriendList = (_ => {
|
||||||
settings: {
|
settings: {
|
||||||
addTotalAmount: {value:true, description:"Add total amount for all/requested/blocked"},
|
addTotalAmount: {value:true, description:"Add total amount for all/requested/blocked"},
|
||||||
addSortOptions: {value:true, description:"Add sort options"},
|
addSortOptions: {value:true, description:"Add sort options"},
|
||||||
addSearchbar: {value:true, description:"Add searchbar"}
|
addSearchbar: {value:true, description:"Add searchbar"},
|
||||||
|
addMutualGuild: {value:true, description:"Add mutual servers in friend list"}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -48,16 +59,20 @@ var BetterFriendList = (_ => {
|
||||||
constructor () {
|
constructor () {
|
||||||
this.changelog = {
|
this.changelog = {
|
||||||
"progress":[["New Features & Name","Name was changed from BetterFriendCount to BetterFriendList and new features were added"]],
|
"progress":[["New Features & Name","Name was changed from BetterFriendCount to BetterFriendList and new features were added"]],
|
||||||
"added":[["Settings","You can now disable the single features of this plugin"]]
|
"improved":[["Settings","You can now disable the single features of this plugin"]],
|
||||||
|
"added":[["Mutual Servers","Mutual servers are now displayed in the friend list again"]]
|
||||||
};
|
};
|
||||||
|
|
||||||
this.patchedModules = {
|
this.patchedModules = {
|
||||||
before: {
|
before: {
|
||||||
PeopleListSectionedLazy: "default"
|
PeopleListSectionedLazy: "default",
|
||||||
},
|
},
|
||||||
after: {
|
after: {
|
||||||
TabBar: "render",
|
TabBar: "render",
|
||||||
PeopleListItem: ["componentWillMount","componentWillUnmount"]
|
FriendRow: "render",
|
||||||
|
PendingRow: "default",
|
||||||
|
BlockedRow: "render",
|
||||||
|
PeopleListItem: ["render", "componentWillMount","componentWillUnmount"]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -237,9 +252,32 @@ var BetterFriendList = (_ => {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
processFriendRow (e) {
|
||||||
|
e.returnvalue.props.mutualGuilds = e.instance.props.mutualGuilds;
|
||||||
|
}
|
||||||
|
|
||||||
|
processPendingRow (e) {
|
||||||
|
this.processFriendRow(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
processBlockedRow (e) {
|
||||||
|
this.processFriendRow(e);
|
||||||
|
}
|
||||||
|
|
||||||
processPeopleListItem (e) {
|
processPeopleListItem (e) {
|
||||||
BDFDB.TimeUtils.clear(rerenderTimeout);
|
if (e.node) {
|
||||||
rerenderTimeout = BDFDB.TimeUtils.timeout(_ => {BDFDB.ModuleUtils.forceAllUpdates(this, "TabBar");}, 1000);
|
BDFDB.TimeUtils.clear(rerenderTimeout);
|
||||||
|
rerenderTimeout = BDFDB.TimeUtils.timeout(_ => {BDFDB.ModuleUtils.forceAllUpdates(this, "TabBar");}, 1000);
|
||||||
|
}
|
||||||
|
else if (settings.addMutualGuild && e.instance.props.mutualGuilds && e.instance.props.mutualGuilds.length) {
|
||||||
|
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "UserInfo"});
|
||||||
|
if (index > -1) children.splice(index + 1, 0, BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.GuildSummaryItem, {
|
||||||
|
className: BDFDB.disCN._betterfriendlistmutualguilds,
|
||||||
|
guilds: e.instance.props.mutualGuilds,
|
||||||
|
tooltip: true,
|
||||||
|
max: 10
|
||||||
|
}, true));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
createBadge (amount) {
|
createBadge (amount) {
|
||||||
|
@ -258,7 +296,7 @@ var BetterFriendList = (_ => {
|
||||||
forceUpdateAll() {
|
forceUpdateAll() {
|
||||||
settings = BDFDB.DataUtils.get(this, "settings");
|
settings = BDFDB.DataUtils.get(this, "settings");
|
||||||
|
|
||||||
BDFDB.ModuleUtils.forceAllUpdates(this, "TabBar");
|
BDFDB.ModuleUtils.forceAllUpdates(this);
|
||||||
this.rerenderList();
|
this.rerenderList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue