commit dad07bbc08cc92c86f2fa19d2009835debe14594 · dunkirk.sh/cachet

+17 -7

src/cache.ts

···

       143
       143
        
          */

     

       144
       144
        
         async purgeUserCache(userId: string): Promise<boolean> {

     

       145
       145
        
           try {

     

       146
       146
       -
             const result = this.db.run("DELETE FROM users WHERE userId = ?", [userId]);

     

       146
       146
       +
             const result = this.db.run("DELETE FROM users WHERE userId = ?", [

     

       147
       147
       +
               userId.toUpperCase(),

     

       148
       148
       +
             ]);

     

       147
       149
        
             return result.changes > 0;

     

       148
       150
        
           } catch (error) {

     

       149
       151
        
             console.error("Error purging user cache:", error);

     
···

       216
       218
        
                  DO UPDATE SET imageUrl = ?, expiration = ?`,

     

       217
       219
        
               [

     

       218
       220
        
                 id,

     

       219
       219
       -
                 userId,

     

       221
       221
       +
                 userId.toUpperCase(),

     

       220
       222
        
                 displayName,

     

       221
       223
        
                 pronouns,

     

       222
       224
        
                 imageUrl,

     
···

       255
       257
        
                 VALUES (?, ?, ?, ?, ?)

     

       256
       258
        
                 ON CONFLICT(name)

     

       257
       259
        
                 DO UPDATE SET imageUrl = ?, expiration = ?`,

     

       258
       258
       -
               [id, name, alias, imageUrl, expiration, imageUrl, expiration],

     

       260
       260
       +
               [

     

       261
       261
       +
                 id,

     

       262
       262
       +
                 name.toLowerCase(),

     

       263
       263
       +
                 alias?.toLowerCase() || null,

     

       264
       264
       +
                 imageUrl,

     

       265
       265
       +
                 expiration,

     

       266
       266
       +
                 imageUrl,

     

       267
       267
       +
                 expiration,

     

       268
       268
       +
               ],

     

       259
       269
        
             );

     

       260
       270
        
             return true;

     

       261
       271
        
           } catch (error) {

     
···

       288
       298
        
                    DO UPDATE SET imageUrl = ?, expiration = ?`,

     

       289
       299
        
                   [

     

       290
       300
        
                     id,

     

       291
       291
       -
                     emoji.name,

     

       292
       292
       -
                     emoji.alias,

     

       301
       301
       +
                     emoji.name.toLowerCase(),

     

       302
       302
       +
                     emoji.alias?.toLowerCase() || null,

     

       293
       303
        
                     emoji.imageUrl,

     

       294
       304
        
                     expiration,

     

       295
       305
        
                     emoji.imageUrl,

     
···

       333
       343
        
         async getUser(userId: string): Promise<User | null> {

     

       334
       344
        
           const result = this.db

     

       335
       345
        
             .query("SELECT * FROM users WHERE userId = ?")

     

       336
       336
       -
             .get(userId) as User;

     

       346
       346
       +
             .get(userId.toUpperCase()) as User;

     

       337
       347
        
       

     

       338
       348
        
           if (!result) {

     

       339
       349
        
             return null;

     
···

       363
       373
        
         async getEmoji(name: string): Promise<Emoji | null> {

     

       364
       374
        
           const result = this.db

     

       365
       375
        
             .query("SELECT * FROM emojis WHERE name = ? AND expiration > ?")

     

       366
       366
       -
             .get(name, Date.now()) as Emoji;

     

       376
       376
       +
             .get(name.toLowerCase(), Date.now()) as Emoji;

     

       367
       377
        
       

     

       368
       378
        
           return result

     

       369
       379
        
             ? {

+3 -3

src/index.ts

···

       224
       224
        
         .get(

     

       225
       225
        
           "/users/:user",

     

       226
       226
        
           async ({ params, error, request }) => {

     

       227
       227
       -
             const user = await cache.getUser(params.user.toLowerCase());

     

       227
       227
       +
             const user = await cache.getUser(params.user);

     

       228
       228
        
       

     

       229
       229
        
             // if not found then check slack first

     

       230
       230
        
             if (!user || !user.imageUrl) {

     
···

       424
       424
        
         .get(

     

       425
       425
        
           "/emojis/:emoji",

     

       426
       426
        
           async ({ params, error }) => {

     

       427
       427
       -
             const emoji = await cache.getEmoji(params.emoji.toLowerCase());

     

       427
       427
       +
             const emoji = await cache.getEmoji(params.emoji);

     

       428
       428
        
       

     

       429
       429
        
             if (!emoji) return error(404, { message: "Emoji not found" });

     

       430
       430
        
       

     
···

       468
       468
        
         .get(

     

       469
       469
        
           "/emojis/:emoji/r",

     

       470
       470
        
           async ({ params, error, redirect }) => {

     

       471
       471
       -
             const emoji = await cache.getEmoji(params.emoji.toLowerCase());

     

       471
       471
       +
             const emoji = await cache.getEmoji(params.emoji);

     

       472
       472
        
       

     

       473
       473
        
             if (!emoji) return error(404, { message: "Emoji not found" });

     

       474
       474