commit c806270e277d3b872e4dc0da99aa69b9cdac8925 · juli.ee/cleanfollow

+22 -22

package-lock.json

···

       1537
       1537
        
             "dev": true

     

       1538
       1538
        
           },

     

       1539
       1539
        
           "node_modules/ansi-regex": {

     

       1540
       1540
       -
             "version": "6.0.1",

     

       1541
       1541
       -
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",

     

       1542
       1542
       -
             "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",

     

       1540
       1540
       +
             "version": "6.1.0",

     

       1541
       1541
       +
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",

     

       1542
       1542
       +
             "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",

     

       1543
       1543
        
             "dev": true,

     

       1544
       1544
        
             "engines": {

     

       1545
       1545
        
               "node": ">=12"

     
···

       1748
       1748
        
             }

     

       1749
       1749
        
           },

     

       1750
       1750
        
           "node_modules/caniuse-lite": {

     

       1751
       1751
       -
             "version": "1.0.30001657",

     

       1752
       1752
       -
             "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001657.tgz",

     

       1753
       1753
       -
             "integrity": "sha512-DPbJAlP8/BAXy3IgiWmZKItubb3TYGP0WscQQlVGIfT4s/YlFYVuJgyOsQNP7rJRChx/qdMeLJQJP0Sgg2yjNA==",

     

       1751
       1751
       +
             "version": "1.0.30001660",

     

       1752
       1752
       +
             "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",

     

       1753
       1753
       +
             "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",

     

       1754
       1754
        
             "dev": true,

     

       1755
       1755
        
             "funding": [

     

       1756
       1756
        
               {

     
···

       1879
       1879
        
             "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="

     

       1880
       1880
        
           },

     

       1881
       1881
        
           "node_modules/debug": {

     

       1882
       1882
       -
             "version": "4.3.6",

     

       1883
       1883
       -
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",

     

       1884
       1884
       -
             "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",

     

       1882
       1882
       +
             "version": "4.3.7",

     

       1883
       1883
       +
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",

     

       1884
       1884
       +
             "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",

     

       1885
       1885
        
             "dev": true,

     

       1886
       1886
        
             "dependencies": {

     

       1887
       1887
       -
               "ms": "2.1.2"

     

       1887
       1887
       +
               "ms": "^2.1.3"

     

       1888
       1888
        
             },

     

       1889
       1889
        
             "engines": {

     

       1890
       1890
        
               "node": ">=6.0"

     
···

       1914
       1914
        
             "dev": true

     

       1915
       1915
        
           },

     

       1916
       1916
        
           "node_modules/electron-to-chromium": {

     

       1917
       1917
       -
             "version": "1.5.14",

     

       1918
       1918
       -
             "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.14.tgz",

     

       1919
       1919
       -
             "integrity": "sha512-bEfPECb3fJ15eaDnu9LEJ2vPGD6W1vt7vZleSVyFhYuMIKm3vz/g9lt7IvEzgdwj58RjbPKUF2rXTCN/UW47tQ==",

     

       1917
       1917
       +
             "version": "1.5.19",

     

       1918
       1918
       +
             "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.19.tgz",

     

       1919
       1919
       +
             "integrity": "sha512-kpLJJi3zxTR1U828P+LIUDZ5ohixyo68/IcYOHLqnbTPr/wdgn4i1ECvmALN9E16JPA6cvCG5UG79gVwVdEK5w==",

     

       1920
       1920
        
             "dev": true

     

       1921
       1921
        
           },

     

       1922
       1922
        
           "node_modules/emoji-regex": {

     
···

       2408
       2408
        
             }

     

       2409
       2409
        
           },

     

       2410
       2410
        
           "node_modules/ms": {

     

       2411
       2411
       -
             "version": "2.1.2",

     

       2412
       2412
       -
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

     

       2413
       2413
       -
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",

     

       2411
       2411
       +
             "version": "2.1.3",

     

       2412
       2412
       +
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

     

       2413
       2413
       +
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",

     

       2414
       2414
        
             "dev": true

     

       2415
       2415
        
           },

     

       2416
       2416
        
           "node_modules/multiformats": {

     
···

       2955
       2955
        
             }

     

       2956
       2956
        
           },

     

       2957
       2957
        
           "node_modules/source-map-js": {

     

       2958
       2958
       -
             "version": "1.2.0",

     

       2959
       2959
       -
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",

     

       2960
       2960
       -
             "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",

     

       2958
       2958
       +
             "version": "1.2.1",

     

       2959
       2959
       +
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",

     

       2960
       2960
       +
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",

     

       2961
       2961
        
             "dev": true,

     

       2962
       2962
        
             "engines": {

     

       2963
       2963
        
               "node": ">=0.10.0"

     
···

       3199
       3199
        
             "dev": true

     

       3200
       3200
        
           },

     

       3201
       3201
        
           "node_modules/typescript": {

     

       3202
       3202
       -
             "version": "5.5.4",

     

       3203
       3203
       -
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",

     

       3204
       3204
       -
             "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",

     

       3202
       3202
       +
             "version": "5.6.2",

     

       3203
       3203
       +
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",

     

       3204
       3204
       +
             "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",

     

       3205
       3205
        
             "dev": true,

     

       3206
       3206
        
             "bin": {

     

       3207
       3207
        
               "tsc": "bin/tsc",

+116 -91

src/App.tsx

···

       18
       18
        
         DEACTIVATED = 1 << 3,

     

       19
       19
        
         SUSPENDED = 1 << 4,

     

       20
       20
        
         YOURSELF = 1 << 5,

     

       21
       21
       +
         NONMUTUAL = 1 << 6,

     

       21
       22
        
       }

     

       22
       23
        
       

     

       23
       24
        
       type FollowRecord = {

     
···

       26
       27
        
         uri: string;

     

       27
       28
        
         status: RepoStatus;

     

       28
       29
        
         toBeDeleted: boolean;

     

       30
       30
       +
         visible: boolean;

     

       29
       31
        
       };

     

       30
       32
        
       

     

       31
       33
        
       const [followRecords, setFollowRecords] = createStore<FollowRecord[]>([]);

     
···

       77
       79
        
           });

     

       78
       80
        
         }

     

       79
       81
        
       

     

       80
       80
       -
         const options: Record<string, { status: RepoStatus; label: string }> = {

     

       81
       81
       -
           deleted: {

     

       82
       82
       -
             status: RepoStatus.DELETED,

     

       83
       83
       -
             label: "Deleted",

     

       84
       84
       -
           },

     

       85
       85
       -
           deactivated: {

     

       86
       86
       -
             status: RepoStatus.DEACTIVATED,

     

       87
       87
       -
             label: "Deactivated",

     

       88
       88
       -
           },

     

       89
       89
       -
           suspended: {

     

       90
       90
       -
             status: RepoStatus.SUSPENDED,

     

       91
       91
       -
             label: "Suspended",

     

       92
       92
       -
           },

     

       93
       93
       -
           blockedby: {

     

       94
       94
       -
             status: RepoStatus.BLOCKEDBY,

     

       95
       95
       -
             label: "Blocked By",

     

       96
       96
       -
           },

     

       97
       97
       -
           blocking: {

     

       98
       98
       -
             status: RepoStatus.BLOCKING,

     

       99
       99
       -
             label: "Blocking",

     

       100
       100
       -
           },

     

       101
       101
       -
         };

     

       82
       82
       +
         function changeVisibility(status: RepoStatus, visible: boolean) {

     

       83
       83
       +
           followRecords.forEach((record, index) => {

     

       84
       84
       +
             if (record.status & status) setFollowRecords(index, "visible", visible);

     

       85
       85
       +
           });

     

       86
       86
       +
         }

     

       87
       87
       +
       

     

       88
       88
       +
         const options: { status: RepoStatus; label: string }[] = [

     

       89
       89
       +
           { status: RepoStatus.DELETED, label: "Deleted" },

     

       90
       90
       +
           { status: RepoStatus.DEACTIVATED, label: "Deactivated" },

     

       91
       91
       +
           { status: RepoStatus.SUSPENDED, label: "Suspended" },

     

       92
       92
       +
           { status: RepoStatus.BLOCKEDBY, label: "Blocked By" },

     

       93
       93
       +
           { status: RepoStatus.BLOCKING, label: "Blocking" },

     

       94
       94
       +
           { status: RepoStatus.NONMUTUAL, label: "Non Mutual" },

     

       95
       95
       +
         ];

     

       102
       96
        
       

     

       103
       97
        
         return (

     

       104
       104
       -
           <div class="mt-3">

     

       105
       105
       -
             <Show when={followRecords.length}>

     

       106
       106
       -
               <div class="flex flex-row flex-wrap gap-x-5 gap-y-2">

     

       107
       107
       -
                 <For each={Object.entries(options)}>

     

       108
       108
       -
                   {(option) => (

     

       109
       109
       -
                     <div class="flex h-6 items-center">

     

       98
       98
       +
           <div class="mt-3 flex flex-col sm:flex-row">

     

       99
       99
       +
             <div class="mr-5 mb-3 pb-3 justify-around sm:mb-0 sm:top-3 top-0 border-b border-b-gray-400 sm:border-none w-full bg-white sm:w-auto sticky sm:self-start flex flex-wrap sm:flex-col">

     

       100
       100
       +
               <For each={options}>

     

       101
       101
       +
                 {(option, index) => (

     

       102
       102
       +
                   <div

     

       103
       103
       +
                     classList={{

     

       104
       104
       +
                       "sm:pb-2 min-w-36 sm:mb-2 mt-3 sm:mt-0": true,

     

       105
       105
       +
                       "sm:border-b sm:border-b-gray-300":

     

       106
       106
       +
                         index() < options.length - 1,

     

       107
       107
       +
                     }}

     

       108
       108
       +
                   >

     

       109
       109
       +
                     <div>

     

       110
       110
       +
                       <label class="inline-flex items-center mt-1 mb-2 cursor-pointer">

     

       111
       111
       +
                         <input

     

       112
       112
       +
                           type="checkbox"

     

       113
       113
       +
                           class="sr-only peer"

     

       114
       114
       +
                           checked

     

       115
       115
       +
                           onChange={(e) =>

     

       116
       116
       +
                             changeVisibility(option.status, e.currentTarget.checked)

     

       117
       117
       +
                           }

     

       118
       118
       +
                         />

     

       119
       119
       +
                         <span class="relative w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></span>

     

       120
       120
       +
                         <span class="ms-3 dark:text-gray-300 select-none">

     

       121
       121
       +
                           {option.label}

     

       122
       122
       +
                         </span>

     

       123
       123
       +
                       </label>

     

       124
       124
       +
                     </div>

     

       125
       125
       +
                     <div class="flex items-center">

     

       110
       126
        
                       <input

     

       111
       127
        
                         type="checkbox"

     

       112
       112
       -
                         id={option[0]}

     

       113
       113
       -
                         class="h-4 w-4 rounded border-gray-400 text-indigo-600 focus:ring-indigo-600"

     

       128
       128
       +
                         id={option.label}

     

       129
       129
       +
                         class="h-4 w-4 rounded"

     

       114
       130
        
                         onChange={(e) =>

     

       115
       115
       -
                           selectRecords(option[1].status, e.currentTarget.checked)

     

       131
       131
       +
                           selectRecords(option.status, e.currentTarget.checked)

     

       116
       132
        
                         }

     

       117
       133
        
                       />

     

       118
       118
       -
                       <label for={option[0]} class="ml-2 select-none">

     

       119
       119
       -
                         {option[1].label}

     

       134
       134
       +
                       <label for={option.label} class="ml-2 select-none">

     

       135
       135
       +
                         Select All

     

       120
       136
        
                       </label>

     

       121
       137
        
                     </div>

     

       122
       122
       -
                   )}

     

       123
       123
       -
                 </For>

     

       124
       124
       -
               </div>

     

       125
       125
       -
             </Show>

     

       126
       126
       -
             <div class="mt-5">

     

       138
       138
       +
                   </div>

     

       139
       139
       +
                 )}

     

       140
       140
       +
               </For>

     

       141
       141
       +
             </div>

     

       142
       142
       +
             <div>

     

       127
       143
        
               <For each={followRecords}>

     

       128
       144
        
                 {(record, index) => (

     

       129
       129
       -
                   <div class="flex flex-row items-center border-b mb-2 pb-2">

     

       130
       130
       -
                     <div class="mr-4">

     

       131
       131
       -
                       <input

     

       132
       132
       -
                         type="checkbox"

     

       133
       133
       -
                         id={"record" + index()}

     

       134
       134
       -
                         class="h-4 w-4 rounded border-gray-400 text-indigo-600 focus:ring-indigo-600"

     

       135
       135
       -
                         checked={record.toBeDeleted}

     

       136
       136
       -
                         onChange={(e) =>

     

       137
       137
       -
                           setFollowRecords(

     

       138
       138
       -
                             index(),

     

       139
       139
       -
                             "toBeDeleted",

     

       140
       140
       -
                             e.currentTarget.checked,

     

       141
       141
       -
                           )

     

       142
       142
       -
                         }

     

       143
       143
       -
                       />

     

       145
       145
       +
                   <Show when={record.visible}>

     

       146
       146
       +
                     <div class="flex items-center border-b mb-2 pb-2">

     

       147
       147
       +
                       <div class="mr-4">

     

       148
       148
       +
                         <input

     

       149
       149
       +
                           type="checkbox"

     

       150
       150
       +
                           id={"record" + index()}

     

       151
       151
       +
                           class="h-4 w-4 rounded border-gray-400 text-indigo-600 focus:ring-indigo-600"

     

       152
       152
       +
                           checked={record.toBeDeleted}

     

       153
       153
       +
                           onChange={(e) =>

     

       154
       154
       +
                             setFollowRecords(

     

       155
       155
       +
                               index(),

     

       156
       156
       +
                               "toBeDeleted",

     

       157
       157
       +
                               e.currentTarget.checked,

     

       158
       158
       +
                             )

     

       159
       159
       +
                           }

     

       160
       160
       +
                         />

     

       161
       161
       +
                       </div>

     

       162
       162
       +
                       <div>

     

       163
       163
       +
                         <label for={"record" + index()} class="flex flex-col">

     

       164
       164
       +
                           <span>@{record.handle}</span>

     

       165
       165
       +
                           <span>{record.did}</span>

     

       166
       166
       +
                           <span>

     

       167
       167
       +
                             <Switch>

     

       168
       168
       +
                               <Match

     

       169
       169
       +
                                 when={

     

       170
       170
       +
                                   record.status ==

     

       171
       171
       +
                                   (RepoStatus.BLOCKEDBY | RepoStatus.BLOCKING)

     

       172
       172
       +
                                 }

     

       173
       173
       +
                               >

     

       174
       174
       +
                                 Mutual Block

     

       175
       175
       +
                               </Match>

     

       176
       176
       +
                               <Match when={record.status == RepoStatus.DELETED}>

     

       177
       177
       +
                                 Deleted

     

       178
       178
       +
                               </Match>

     

       179
       179
       +
                               <Match when={record.status == RepoStatus.DEACTIVATED}>

     

       180
       180
       +
                                 Deactivated

     

       181
       181
       +
                               </Match>

     

       182
       182
       +
                               <Match when={record.status == RepoStatus.BLOCKEDBY}>

     

       183
       183
       +
                                 Blocked by

     

       184
       184
       +
                               </Match>

     

       185
       185
       +
                               <Match when={record.status == RepoStatus.BLOCKING}>

     

       186
       186
       +
                                 Blocking

     

       187
       187
       +
                               </Match>

     

       188
       188
       +
                               <Match when={record.status == RepoStatus.SUSPENDED}>

     

       189
       189
       +
                                 Suspended

     

       190
       190
       +
                               </Match>

     

       191
       191
       +
                               <Match when={record.status == RepoStatus.YOURSELF}>

     

       192
       192
       +
                                 Literally Yourself

     

       193
       193
       +
                               </Match>

     

       194
       194
       +
                               <Match when={record.status == RepoStatus.NONMUTUAL}>

     

       195
       195
       +
                                 Non Mutual

     

       196
       196
       +
                               </Match>

     

       197
       197
       +
                             </Switch>

     

       198
       198
       +
                           </span>

     

       199
       199
       +
                         </label>

     

       200
       200
       +
                       </div>

     

       144
       201
        
                     </div>

     

       145
       145
       -
                     <div>

     

       146
       146
       -
                       <label for={"record" + index()} class="flex flex-col">

     

       147
       147
       -
                         <span>@{record.handle}</span>

     

       148
       148
       -
                         <span>{record.did}</span>

     

       149
       149
       -
                         <span>

     

       150
       150
       -
                           <Switch>

     

       151
       151
       -
                             <Match

     

       152
       152
       -
                               when={

     

       153
       153
       -
                                 record.status ==

     

       154
       154
       -
                                 (RepoStatus.BLOCKEDBY | RepoStatus.BLOCKING)

     

       155
       155
       -
                               }

     

       156
       156
       -
                             >

     

       157
       157
       -
                               Mutual Block

     

       158
       158
       -
                             </Match>

     

       159
       159
       -
                             <Match when={record.status == RepoStatus.DELETED}>

     

       160
       160
       -
                               Deleted

     

       161
       161
       -
                             </Match>

     

       162
       162
       -
                             <Match when={record.status == RepoStatus.DEACTIVATED}>

     

       163
       163
       -
                               Deactivated

     

       164
       164
       -
                             </Match>

     

       165
       165
       -
                             <Match when={record.status == RepoStatus.BLOCKEDBY}>

     

       166
       166
       -
                               Blocked by

     

       167
       167
       -
                             </Match>

     

       168
       168
       -
                             <Match when={record.status == RepoStatus.BLOCKING}>

     

       169
       169
       -
                               Blocking

     

       170
       170
       -
                             </Match>

     

       171
       171
       -
                             <Match when={record.status == RepoStatus.SUSPENDED}>

     

       172
       172
       -
                               Suspended

     

       173
       173
       -
                             </Match>

     

       174
       174
       -
                             <Match when={record.status == RepoStatus.YOURSELF}>

     

       175
       175
       -
                               Literally Yourself

     

       176
       176
       -
                             </Match>

     

       177
       177
       -
                           </Switch>

     

       178
       178
       -
                         </span>

     

       179
       179
       -
                       </label>

     

       180
       180
       -
                     </div>

     

       181
       181
       -
                   </div>

     

       202
       202
       +
                   </Show>

     

       182
       203
        
                 )}

     

       183
       204
        
               </For>

     

       184
       205
        
             </div>

     
···

       228
       249
        
       

     

       229
       250
        
                 const viewer = res.data.viewer!;

     

       230
       251
        
                 let status: RepoStatus | undefined = undefined;

     

       252
       252
       +
       

     

       253
       253
       +
                 if (!viewer.followedBy) status = RepoStatus.NONMUTUAL;

     

       231
       254
        
       

     

       232
       255
        
                 if (viewer.blockedBy) {

     

       233
       256
        
                   status =

     
···

       247
       270
        
                     uri: record.uri,

     

       248
       271
        
                     status: status,

     

       249
       272
        
                     toBeDeleted: false,

     

       273
       273
       +
                     visible: true,

     

       250
       274
        
                   });

     

       251
       275
        
                 }

     

       252
       276
        
               } catch (e: any) {

     
···

       281
       305
        
                     uri: record.uri,

     

       282
       306
        
                     status: status,

     

       283
       307
        
                     toBeDeleted: false,

     

       308
       308
       +
                     visible: true,

     

       284
       309
        
                   });

     

       285
       310
        
                 }

     

       286
       311
        
               }

     
···

       409
       434
        
               </div>

     

       410
       435
        
             </div>

     

       411
       436
        
             <Form />

     

       412
       412
       -
             <Show when={loginState()}>

     

       437
       437
       +
             <Show when={loginState() && followRecords.length}>

     

       413
       438
        
               <Follows />

     

       414
       439
        
             </Show>

     

       415
       440
        
           </div>