refactor discord types into separate npm package (#3520)
Co-authored-by: V <vendicated@riseup.net> Co-authored-by: sadan <117494111+sadan4@users.noreply.github.com> Co-authored-by: ezzud <contact@ezzud.fr>
This commit is contained in:
parent
c55833d95f
commit
dc9064326b
149 changed files with 1561 additions and 751 deletions
|
|
@ -144,7 +144,14 @@ function playSample(tempSettings: any, type: string) {
|
|||
const currentUser = UserStore.getCurrentUser();
|
||||
const myGuildId = SelectedGuildStore.getGuildId();
|
||||
|
||||
speak(formatText(s[type + "Message"], currentUser.username, "general", (currentUser as any).globalName ?? currentUser.username, GuildMemberStore.getNick(myGuildId, currentUser.id) ?? currentUser.username), s);
|
||||
speak(formatText(
|
||||
s[type + "Message"],
|
||||
currentUser.username,
|
||||
"general",
|
||||
currentUser.globalName ?? currentUser.username,
|
||||
GuildMemberStore.getNick(myGuildId!, currentUser.id) ?? currentUser.username),
|
||||
s
|
||||
);
|
||||
}
|
||||
|
||||
export default definePlugin({
|
||||
|
|
@ -177,7 +184,7 @@ export default definePlugin({
|
|||
const template = settings.store[type + "Message"];
|
||||
const user = isMe && !settings.store.sayOwnName ? "" : UserStore.getUser(userId).username;
|
||||
const displayName = user && ((UserStore.getUser(userId) as any).globalName ?? user);
|
||||
const nickname = user && (GuildMemberStore.getNick(myGuildId, userId) ?? user);
|
||||
const nickname = user && (GuildMemberStore.getNick(myGuildId!, userId) ?? user);
|
||||
const channel = ChannelStore.getChannel(id).name;
|
||||
|
||||
speak(formatText(template, user, channel, displayName, nickname));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue