Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add lazyrequest sessions priority

Browse Source
This commit is contained in:
Madeline 2022-09-07 23:56:44 +10:00
parent 76b8522a2c
commit 09a5ce38ba
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gateway/src/opcodes/LazyRequest.ts
View File

@ -18,7 +18,7 @@ async function getMembers(guild_id: string, range: [number, number]) {
} }
// TODO: wait for typeorm to implement ordering for .find queries https://github.com/typeorm/typeorm/issues/2620 // TODO: wait for typeorm to implement ordering for .find queries https://github.com/typeorm/typeorm/issues/2620
let members; let members: Member[] = [];
try { try {
members = await getRepository(Member) members = await getRepository(Member)
.createQueryBuilder("member") .createQueryBuilder("member")
@ -33,8 +33,8 @@ async function getMembers(guild_id: string, range: [number, number]) {
.orderBy("role.position", "DESC") .orderBy("role.position", "DESC")
.addOrderBy("_status", "DESC") .addOrderBy("_status", "DESC")
.addOrderBy("user.username", "ASC") .addOrderBy("user.username", "ASC")
.offset(Number(range[0]) || 0) .skip(Number(range[0]) || 0)
.limit(Number(range[1]) || 100) .take(Number(range[1]) || 100)
.getMany(); .getMany();
} }
catch (e) { catch (e) {
@ -62,7 +62,7 @@ async function getMembers(guild_id: string, range: [number, number]) {
for (const role of member_roles) { for (const role of member_roles) {
// @ts-ignore // @ts-ignore
const [role_members, other_members] = partition(members, (m: Member) => const [role_members, other_members]: Member[][] = partition(members, (m: Member) =>
m.roles.find((r) => r.id === role.id) m.roles.find((r) => r.id === role.id)
); );
const group = { const group = {
@ -78,7 +78,18 @@ async function getMembers(guild_id: string, range: [number, number]) {
.filter((x: Role) => x.id !== guild_id) .filter((x: Role) => x.id !== guild_id)
.map((x: Role) => x.id); .map((x: Role) => x.id);
const session: Session = member.user.sessions.first(); const statusMap = {
"online": 0,
"idle": 1,
"dnd": 2,
"invisible": 3,
"offline": 4, // for ts, will never be accessed
};
// sort sessions by relevance
const sessions = member.user.sessions.sort((a, b) => {
return (statusMap[a.status] - statusMap[b.status]) + ((a.activities.length - b.activities.length) * 2);
});
var session: Session | undefined = sessions.first();
const item = { const item = {
member: { member: {
@ -138,13 +149,14 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
const ranges = channels![channel_id]; const ranges = channels![channel_id];
if (!Array.isArray(ranges)) throw new Error("Not a valid Array"); if (!Array.isArray(ranges)) throw new Error("Not a valid Array");
const member_count = await Member.count({ guild_id }); const member_count = await Member.count({ where: { guild_id } });
const ops = await Promise.all(ranges.map((x) => getMembers(guild_id, x))); const ops = await Promise.all(ranges.map((x) => getMembers(guild_id, x)));
// TODO: unsubscribe member_events that are not in op.members // TODO: unsubscribe member_events that are not in op.members
ops.forEach((op) => { ops.forEach((op) => {
op.members.forEach(async (member) => { op.members.forEach(async (member) => {
if (!member) return;
if (this.events[member.user.id]) return; // already subscribed as friend if (this.events[member.user.id]) return; // already subscribed as friend
if (this.member_events[member.user.id]) return; // already subscribed in member list if (this.member_events[member.user.id]) return; // already subscribed in member list
this.member_events[member.user.id] = await listenEvent( this.member_events[member.user.id] = await listenEvent(

1
gateway/tsconfig.json
View File

@ -78,6 +78,7 @@
"paths": { "paths": {
"@fosscord/gateway": ["src/index.ts"], "@fosscord/gateway": ["src/index.ts"],
"@fosscord/gateway/*": ["src/*"] "@fosscord/gateway/*": ["src/*"]
"@fosscord/util": ["../util/src"]
}, },
"plugins": [{ "transform": "@zerollup/ts-transform-paths" }] "plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
} }