Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fixes and legacy cleanup #253

Merged
merged 5 commits into from
Jun 9, 2020
Merged

bug fixes and legacy cleanup #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b29d7a1
context menu display fix
Abeous Jun 8, 2020
0e3597b
include custom tag info in cmdtag description
Abeous Jun 8, 2020
19e4f70
remove stalk and mentions from /help and autocomplete
Abeous Jun 8, 2020
71f824d
add context menu to hints
Abeous Jun 9, 2020
f86c557
gutted cmdSTALK and cmdMENTIONS, converted tag's repeated strings to …
Abeous Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 9 additions & 165 deletions assets/chat/js/chat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,13 @@ const hintstrings = new Map([
"Use /ignore <username> to hide messages from pesky chatters"
],
["mutespermanent", "Mutes are never persistent, don't worry it will pass!"],
[
"stalkmentionshint",
"Use the /stalk <nick> or /mentions <nick> to keep up to date"
],
[
"tagshint",
`Use the /tag <nick> <color> to highlight users you like. There are preset colors to choose from ${tagcolors.join(
", "
)}`
]
)}, or \`/tag <nick> #HEXCODE\``
],
["contextmenu", "Right click a user to access quick options!"]
]);
const settingsdefault = new Map([
["schemaversion", 2],
Expand Down Expand Up @@ -172,14 +169,6 @@ const commandsinfo = new Map([
],
["unban", { desc: "Unban a user", admin: true }],
["timestampformat", { desc: "Set the time format of the chat." }],
["stalk", { desc: "Return a list of messages from <nick>", alias: ["s"] }],
[
"mentions",
{
desc: "Return a list of messages where <nick> is mentioned",
alias: ["m"]
}
],
["tag", { desc: "Mark a users messages" }],
["untag", { desc: "No longer mark the users messages" }],
["exit", { desc: "Exit the conversation you are in." }],
Expand Down Expand Up @@ -310,10 +299,6 @@ class Chat {
this.control.on("TELL", data => this.cmdWHISPER(data));
this.control.on("T", data => this.cmdWHISPER(data));
this.control.on("NOTIFY", data => this.cmdWHISPER(data));
this.control.on("MENTIONS", data => this.cmdMENTIONS(data));
this.control.on("M", data => this.cmdMENTIONS(data));
this.control.on("STALK", data => this.cmdSTALK(data));
this.control.on("S", data => this.cmdSTALK(data));
this.control.on("HIDEEMOTE", data =>
this.cmdHIDEEMOTE(data, "HIDEEMOTE")
);
Expand Down Expand Up @@ -1646,149 +1631,6 @@ class Chat {
this.source.connect(parts[0]);
}

cmdSTALK(parts) {
if (parts[0] && /^\d+$/.test(parts[0])) {
parts[1] = parts[0];
parts[0] = this.user.username;
}
if (!parts[0] || !nickregex.test(parts[0].toLowerCase())) {
MessageBuilder.error("Invalid nick - /stalk <nick> <limit>").into(
this
);
return;
}
if (this.busystalk) {
MessageBuilder.error("Still busy stalking").into(this);
return;
}
if (
this.nextallowedstalk &&
this.nextallowedstalk.isAfter(new Date())
) {
MessageBuilder.error(
`Next allowed stalk ${this.nextallowedstalk.fromNow()}`
).into(this);
return;
}
this.busystalk = true;
const limit = parts[1] ? parseInt(parts[1]) : 3;
MessageBuilder.info(`Getting messages for ${[parts[0]]} ...`).into(
this
);
$.ajax({
timeout: 5000,
url: `${API_URI}/api/chat/stalk?username=${encodeURIComponent(
parts[0]
)}&limit=${limit}`
})
.always(() => {
this.nextallowedstalk = moment().add(10, "seconds");
this.busystalk = false;
})
.done(d => {
if (!d || !d.lines || d.lines.length === 0) {
MessageBuilder.info(`No messages for ${parts[0]}`).into(
this
);
} else {
const date = moment
.utc(d.lines[d.lines.length - 1]["timestamp"] * 1000)
.local()
.format(DATE_FORMATS.FULL);
MessageBuilder.info(
`Stalked ${parts[0]} last seen ${date}`
).into(this);
d.lines.forEach(a =>
MessageBuilder.historical(
a.text,
new ChatUser({ nick: d.nick }),
a.timestamp * 1000
).into(this)
);
MessageBuilder.info(
`End of stalk (https://dgg.overrustlelogs.net/${parts[0]})`
).into(this);
}
})
.fail(() =>
MessageBuilder.error(
`No messages for ${parts[0]} received. Try again later`
).into(this)
);
}

cmdMENTIONS(parts) {
if (parts[0] && /^\d+$/.test(parts[0])) {
parts[1] = parts[0];
parts[0] = this.user.username;
}
if (!parts[0]) parts[0] = this.user.username;
if (!parts[0] || !nickregex.test(parts[0].toLowerCase())) {
MessageBuilder.error(
"Invalid nick - /mentions <nick> <limit>"
).into(this);
return;
}
if (this.busymentions) {
MessageBuilder.error("Still busy getting mentions").into(this);
return;
}
if (
this.nextallowedmentions &&
this.nextallowedmentions.isAfter(new Date())
) {
MessageBuilder.error(
`Next allowed mentions ${this.nextallowedmentions.fromNow()}`
).into(this);
return;
}
this.busymentions = true;
const limit = parts[1] ? parseInt(parts[1]) : 3;
MessageBuilder.info(`Getting mentions for ${[parts[0]]} ...`).into(
this
);
$.ajax({
timeout: 5000,
url: `${API_URI}/api/chat/mentions?username=${encodeURIComponent(
parts[0]
)}&limit=${limit}`
})
.always(() => {
this.nextallowedmentions = moment().add(10, "seconds");
this.busymentions = false;
})
.done(d => {
if (!d || d.length === 0) {
MessageBuilder.info(`No mentions for ${parts[0]}`).into(
this
);
} else {
const date = moment
.utc(d[d.length - 1].date * 1000)
.local()
.format(DATE_FORMATS.FULL);
MessageBuilder.info(
`Mentions for ${parts[0]} last seen ${date}`
).into(this);
d.forEach(a =>
MessageBuilder.historical(
a.text,
new ChatUser({ nick: a.nick }),
a.date * 1000
).into(this)
);
MessageBuilder.info(
`End of stalk (https://dgg.overrustlelogs.net/mentions/${parts[0]})`
).into(this);
}
})
.fail(() =>
MessageBuilder.error(
`No mentions for ${parts[0]} received. Try again later`
).into(this)
);
}

createNewClass(color) {
if (color[0] === "#") {
color = color.substring(1);
Expand Down Expand Up @@ -1821,16 +1663,17 @@ class Chat {
}

cmdTAG(parts) {
const colorinfo = `Preset colors: ${tagcolors.join(", ")}, or \`/tag user #HEXCODE\``
if (parts.length === 0) {
if (this.taggednicks.size > 0) {
MessageBuilder.info(
`Tagged nicks: ${[...this.taggednicks.keys()].join(
","
)}. Available colors: ${tagcolors.join(",")}`
)}. ${colorinfo}`
).into(this);
} else {
MessageBuilder.info(
`No tagged nicks. Available colors: ${tagcolors.join(",")}`
`No tagged nicks. ${colorinfo}`
).into(this);
}
return;
Expand Down Expand Up @@ -1877,16 +1720,17 @@ class Chat {
}

cmdUNTAG(parts) {
const colorinfo = `Preset colors: ${tagcolors.join(", ")}, or \`/tag user #HEXCODE\``
if (parts.length === 0) {
if (this.taggednicks.size > 0) {
MessageBuilder.info(
`Tagged nicks: ${[...this.taggednicks.keys()].join(
","
)}. Available colors: ${tagcolors.join(",")}`
)}. ${colorinfo}`
).into(this);
} else {
MessageBuilder.info(
`No tagged nicks. Available colors: ${tagcolors.join(",")}`
`No tagged nicks. ${colorinfo}`
).into(this);
}
return;
Expand Down
8 changes: 6 additions & 2 deletions assets/chat/js/menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,12 @@ class ChatContextMenu {
show(e) {
e.preventDefault()
this.ui.show()
this.ui.css("left", event.pageX)
this.ui.css("top", event.pageY)
this.ui.css("left", this.event.pageX)
if (this.event.pageY > (this.chat.ui.height() * 0.66)) {
this.ui.css("top", (this.event.pageY - this.ui.height()))
} else {
this.ui.css("top", this.event.pageY)
}
}

hide() {
Expand Down