commit cf20050577972130abfb77f502263cc752b71ab6 · dunkirk.sh/cachet

+16 -3

src/cache.ts

···

       23
       23
        
       interface User extends CacheItem {

     

       24
       24
        
         type: "user";

     

       25
       25
        
         displayName: string;

     

       26
       26
       +
         pronouns: string;

     

       26
       27
        
         userId: string;

     

       27
       28
        
       }

     

       28
       29
        
       

     
···

       75
       76
        
               id TEXT PRIMARY KEY,

     

       76
       77
        
               userId TEXT UNIQUE,

     

       77
       78
        
               displayName TEXT,

     

       79
       79
       +
               pronouns TEXT,

     

       78
       80
        
               imageUrl TEXT,

     

       79
       81
        
               expiration INTEGER

     

       80
       82
        
             )

     
···

       183
       185
        
         async insertUser(

     

       184
       186
        
           userId: string,

     

       185
       187
        
           displayName: string,

     

       188
       188
       +
           pronouns: string,

     

       186
       189
        
           imageUrl: string,

     

       187
       190
        
           expirationHours?: number,

     

       188
       191
        
         ) {

     
···

       192
       195
        
       

     

       193
       196
        
           try {

     

       194
       197
        
             this.db.run(

     

       195
       195
       -
               `INSERT INTO users (id, userId, displayName, imageUrl, expiration)

     

       196
       196
       -
                  VALUES (?, ?, ?, ?, ?)

     

       198
       198
       +
               `INSERT INTO users (id, userId, displayName, pronouns, imageUrl, expiration)

     

       199
       199
       +
                  VALUES (?, ?, ?, ?, ?, ?)

     

       197
       200
        
                  ON CONFLICT(userId)

     

       198
       201
        
                  DO UPDATE SET imageUrl = ?, expiration = ?`,

     

       199
       199
       -
               [id, userId, displayName, imageUrl, expiration, imageUrl, expiration],

     

       202
       202
       +
               [

     

       203
       203
       +
                 id,

     

       204
       204
       +
                 userId,

     

       205
       205
       +
                 displayName,

     

       206
       206
       +
                 pronouns,

     

       207
       207
       +
                 imageUrl,

     

       208
       208
       +
                 expiration,

     

       209
       209
       +
                 imageUrl,

     

       210
       210
       +
                 expiration,

     

       211
       211
       +
               ],

     

       200
       212
        
             );

     

       201
       213
        
             return true;

     

       202
       214
        
           } catch (error) {

     
···

       322
       334
        
             id: result.id,

     

       323
       335
        
             userId: result.userId,

     

       324
       336
        
             displayName: result.displayName,

     

       337
       337
       +
             pronouns: result.pronouns,

     

       325
       338
        
             imageUrl: result.imageUrl,

     

       326
       339
        
             expiration: new Date(result.expiration),

     

       327
       340
        
           };

src/index.ts

···

       225
       225
        
               await cache.insertUser(

     

       226
       226
        
                 slackUser.id,

     

       227
       227
        
                 displayName,

     

       228
       228
       +
                 slackUser.profile.pronouns,

     

       228
       229
        
                 slackUser.profile.image_512,

     

       229
       230
        
               );

     

       230
       231
        
       

     
···

       233
       234
        
                 expiration: new Date().toISOString(),

     

       234
       235
        
                 user: slackUser.id,

     

       235
       236
        
                 displayName: displayName,

     

       237
       237
       +
                 pronouns: slackUser.profile.pronouns,

     

       236
       238
        
                 image: slackUser.profile.image_512,

     

       237
       239
        
               };

     

       238
       240
        
             }

     
···

       242
       244
        
               expiration: user.expiration.toISOString(),

     

       243
       245
        
               user: user.userId,

     

       244
       246
        
               displayName: user.displayName,

     

       247
       247
       +
               pronouns: user.pronouns,

     

       245
       248
        
               image: user.imageUrl,

     

       246
       249
        
             };

     

       247
       250
        
           },

     
···

       274
       277
        
                 displayName: t.String({

     

       275
       278
        
                   default: "krn",

     

       276
       279
        
                 }),

     

       280
       280
       +
                 pronouns: t.String({ default: "possibly blank" }),

     

       277
       281
        
                 image: t.String({

     

       278
       282
        
                   default:

     

       279
       283
        
                     "https://avatars.slack-edge.com/2024-11-30/8105375749571_53898493372773a01a1f_original.jpg",

     
···

       324
       328
        
                 slackUser.id,

     

       325
       329
        
                 slackUser.profile.display_name_normalized ||

     

       326
       330
        
                   slackUser.profile.real_name_normalized,

     

       331
       331
       +
                 slackUser.profile.pronouns,

     

       327
       332
        
                 slackUser.profile.image_512,

     

       328
       333
        
               );

     

       329
       334

src/slack.d.ts

···

       86
       86
        
         display_name_normalized: string;

     

       87
       87
        
         /** User's email address */

     

       88
       88
        
         email: string;

     

       89
       89
       +
         /** User's pronouns */

     

       90
       90
       +
         pronouns: string;

     

       89
       91
        
         /** Original size profile image URL */

     

       90
       92
        
         image_original: string;

     

       91
       93
        
         /** 24x24 profile image URL */