comparing f1dba3622aae7fb6532f19f2c441c5f242dea16f and master on nel.pet/core

+21 -2

appview/pages/templates/labels/fragments/label.html

···

       1
       1
        
       {{ define "labels/fragments/label" }}

     

       2
       2
        
         {{ $d := .def }}

     

       3
       3
        
         {{ $v := .val }}

     

       4
       4
       +
         {{ $withPrefix := .withPrefix }}

     

       4
       5
        
         <span class="flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm">

     

       5
       6
        
           {{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }}

     

       6
       6
       -
           {{ $d.Name }}{{ if not $d.ValueType.IsNull }}/{{ template "labelVal" (dict "def" $d "val" $v) }}{{ end }}

     

       7
       7
       +
       

     

       8
       8
       +
           {{ $lhs := printf "%s" $d.Name }}

     

       9
       9
       +
           {{ $rhs := "" }}

     

       10
       10
       +
       

     

       11
       11
       +
           {{ if not $d.ValueType.IsNull }}

     

       12
       12
       +
             {{ if $d.ValueType.IsDidFormat }}

     

       13
       13
       +
               {{ $v = resolve $v }}

     

       14
       14
       +
             {{ end }}

     

       15
       15
       +
       

     

       16
       16
       +
             {{ if not $withPrefix }}

     

       17
       17
       +
               {{ $lhs = "" }}

     

       18
       18
       +
             {{ else }}

     

       19
       19
       +
               {{ $lhs = printf "%s/" $d.Name }}

     

       20
       20
       +
             {{ end }}

     

       21
       21
       +
       

     

       22
       22
       +
             {{ $rhs = printf "%s" $v }}

     

       23
       23
       +
           {{ end }}

     

       24
       24
       +
       

     

       25
       25
       +
           {{ printf "%s%s" $lhs $rhs }}

     

       7
       26
        
         </span>

     

       8
       27
        
       {{ end }}

     

       9
       28
        
       

     
···

       13
       32
        
         {{ $v := .val }}

     

       14
       33
        
       

     

       15
       34
        
         {{ if $d.ValueType.IsDidFormat }}

     

       16
       16
       -
           {{ resolve $v }}

     

       35
       35
       +
             {{ resolve $v }}

     

       17
       36
        
         {{ else }}

     

       18
       37
        
           {{ $v }}

     

       19
       38
        
         {{ end }}

-127

appview/pages/templates/repo/fragments/addLabelModal.html

···

       1
       1
       -
       {{ define "repo/fragments/addLabelModal" }}

     

       2
       2
       -
         {{ $root := .root }}

     

       3
       3
       -
         {{ $subject := .subject }}

     

       4
       4
       -
         {{ $state := .state }}

     

       5
       5
       -
         {{ with $root }}

     

       6
       6
       -
           <form

     

       7
       7
       -
             hx-put="/{{ .RepoInfo.FullName }}/labels/perform"

     

       8
       8
       -
             hx-on::after-request="this.reset()"

     

       9
       9
       -
             hx-indicator="#spinner"

     

       10
       10
       -
             hx-swap="none"

     

       11
       11
       -
             class="flex flex-col gap-4"

     

       12
       12
       -
           >

     

       13
       13
       -
             <p class="text-gray-500 dark:text-gray-400">Add, remove or update labels.</p>

     

       14
       14
       -
       

     

       15
       15
       -
             <input class="hidden" name="repo" value="{{ .RepoInfo.RepoAt.String }}">

     

       16
       16
       -
             <input class="hidden" name="subject" value="{{ $subject }}">

     

       17
       17
       -
       

     

       18
       18
       -
             <div class="flex flex-col gap-2">

     

       19
       19
       -
               {{ $id := 0 }}

     

       20
       20
       -
               {{ range $k, $valset := $state.Inner }}

     

       21
       21
       -
                 {{ $d := index $root.LabelDefs $k }}

     

       22
       22
       -
                 {{ range $v, $s := $valset }}

     

       23
       23
       -
                   {{ template "labelCheckbox" (dict "def" $d "key" $k "val" $v "id" $id "isChecked" true) }}

     

       24
       24
       -
                   {{ $id = add $id 1 }}

     

       25
       25
       -
                 {{ end }}

     

       26
       26
       -
               {{ end }}

     

       27
       27
       -
       

     

       28
       28
       -
               {{ range $k, $d := $root.LabelDefs }}

     

       29
       29
       -
                 {{ if not ($state.ContainsLabel $k) }}

     

       30
       30
       -
                   {{ template "labelCheckbox" (dict "def" $d "key" $k "val" "" "id" $id "isChecked" false) }}

     

       31
       31
       -
                   {{ $id = add $id 1 }}

     

       32
       32
       -
                 {{ end }}

     

       33
       33
       -
               {{ else }}

     

       34
       34
       -
                 <span>

     

       35
       35
       -
                   No labels defined yet. You can define custom labels in <a class="underline" href="/{{ .RepoInfo.FullName }}/settings">settings</a>.

     

       36
       36
       -
                 </span>

     

       37
       37
       -
               {{ end }}

     

       38
       38
       -
             </div>

     

       39
       39
       -
       

     

       40
       40
       -
             <div class="flex gap-2 pt-2">

     

       41
       41
       -
               <button

     

       42
       42
       -
                 type="button"

     

       43
       43
       -
                 popovertarget="add-label-modal"

     

       44
       44
       -
                 popovertargetaction="hide"

     

       45
       45
       -
                 class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"

     

       46
       46
       -
                 >

     

       47
       47
       -
                 {{ i "x" "size-4" }} cancel

     

       48
       48
       -
               </button>

     

       49
       49
       -
               <button type="submit" class="btn w-1/2 flex items-center">

     

       50
       50
       -
                 <span class="inline-flex gap-2 items-center">{{ i "check" "size-4" }} save</span>

     

       51
       51
       -
                 <span id="spinner" class="group">

     

       52
       52
       -
                   {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       53
       53
       -
                 </span>

     

       54
       54
       -
               </button>

     

       55
       55
       -
             </div>

     

       56
       56
       -
             <div id="add-label-error" class="text-red-500 dark:text-red-400"></div>

     

       57
       57
       -
           </form>

     

       58
       58
       -
         {{ end }}

     

       59
       59
       -
       {{ end }}

     

       60
       60
       -
       

     

       61
       61
       -
       {{ define "labelCheckbox" }}

     

       62
       62
       -
         {{ $key := .key }}

     

       63
       63
       -
         {{ $val := .val }}

     

       64
       64
       -
         {{ $def := .def }}

     

       65
       65
       -
         {{ $id := .id }}

     

       66
       66
       -
         {{ $isChecked := .isChecked }}

     

       67
       67
       -
         <div class="grid grid-cols-[auto_1fr_50%] gap-2 items-center cursor-pointer">

     

       68
       68
       -
           <input type="checkbox" id="op-{{$id}}" name="op-{{$id}}" value="add" {{if $isChecked}}checked{{end}} class="peer">

     

       69
       69
       -
           <label for="op-{{$id}}" class="flex items-center gap-2 text-base">{{ template "labels/fragments/labelDef" $def }}</label>

     

       70
       70
       -
           <div class="w-full hidden peer-checked:block">{{ template "valueTypeInput" (dict "valueType" $def.ValueType "value" $val "key" $key) }}</div>

     

       71
       71
       -
           <input type="hidden" name="operand-key" value="{{ $key }}">

     

       72
       72
       -
         </div>

     

       73
       73
       -
       {{ end }}

     

       74
       74
       -
       

     

       75
       75
       -
       {{ define "valueTypeInput" }}

     

       76
       76
       -
         {{ $valueType := .valueType }}

     

       77
       77
       -
         {{ $value := .value }}

     

       78
       78
       -
         {{ $key := .key }}

     

       79
       79
       -
       

     

       80
       80
       -
         {{ if $valueType.IsEnumType }}

     

       81
       81
       -
           {{ template "enumTypeInput" $ }}

     

       82
       82
       -
         {{ else if $valueType.IsBool }}

     

       83
       83
       -
           {{ template "boolTypeInput" $ }}

     

       84
       84
       -
         {{ else if $valueType.IsInt }}

     

       85
       85
       -
           {{ template "intTypeInput" $ }}

     

       86
       86
       -
         {{ else if $valueType.IsString }}

     

       87
       87
       -
           {{ template "stringTypeInput" $ }}

     

       88
       88
       -
         {{ else if $valueType.IsNull }}

     

       89
       89
       -
           {{ template "nullTypeInput" $ }}

     

       90
       90
       -
         {{ end }}

     

       91
       91
       -
       {{ end }}

     

       92
       92
       -
       

     

       93
       93
       -
       {{ define "enumTypeInput" }}

     

       94
       94
       -
         {{ $valueType := .valueType }}

     

       95
       95
       -
         {{ $value := .value }}

     

       96
       96
       -
         <select name="operand-val" class="w-full p-1 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       97
       97
       -
           {{ range $valueType.Enum }}

     

       98
       98
       -
             <option value="{{.}}" {{ if eq $value . }} selected {{ end }}>{{.}}</option>

     

       99
       99
       -
           {{ end }}

     

       100
       100
       -
         </select>

     

       101
       101
       -
       {{ end }}

     

       102
       102
       -
       

     

       103
       103
       -
       {{ define "boolTypeInput" }}

     

       104
       104
       -
         {{ $value := .value }}

     

       105
       105
       -
         <select name="operand-val" class="w-full p-1 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       106
       106
       -
           <option value="true" {{ if $value }} selected {{ end }}>true</option>

     

       107
       107
       -
           <option value="false" {{ if not $value }} selected {{ end }}>false</option>

     

       108
       108
       -
         </select>

     

       109
       109
       -
       {{ end }}

     

       110
       110
       -
       

     

       111
       111
       -
       {{ define "intTypeInput" }}

     

       112
       112
       -
         {{ $value := .value }}

     

       113
       113
       -
         <input class="p-1 w-full" type="number" name="operand-val" value="{{$value}}" max="100">

     

       114
       114
       -
       {{ end }}

     

       115
       115
       -
       

     

       116
       116
       -
       {{ define "stringTypeInput" }}

     

       117
       117
       -
         {{ $valueType := .valueType }}

     

       118
       118
       -
         {{ $value := .value }}

     

       119
       119
       -
         {{ if $valueType.IsDidFormat }}

     

       120
       120
       -
           {{ $value = resolve .value }}

     

       121
       121
       -
         {{ end }}

     

       122
       122
       -
         <input class="p-1 w-full" type="text" name="operand-val" value="{{$value}}">

     

       123
       123
       -
       {{ end }}

     

       124
       124
       -
       

     

       125
       125
       -
       {{ define "nullTypeInput" }}

     

       126
       126
       -
         <input class="p-1" type="hidden" name="operand-val" value="null">

     

       127
       127
       -
       {{ end }}

+208

appview/pages/templates/repo/fragments/editLabelPanel.html

···

       1
       1
       +
       {{ define "repo/fragments/editLabelPanel" }}

     

       2
       2
       +
         <form

     

       3
       3
       +
           id="edit-label-panel"

     

       4
       4
       +
           hx-put="/{{ .RepoInfo.FullName }}/labels/perform"

     

       5
       5
       +
           hx-indicator="#spinner"

     

       6
       6
       +
           hx-disabled-elt="#save-btn,#cancel-btn"

     

       7
       7
       +
           hx-swap="none"

     

       8
       8
       +
           class="flex flex-col gap-6"

     

       9
       9
       +
           >

     

       10
       10
       +
           <input type="hidden" name="repo" value="{{ .RepoInfo.RepoAt }}">

     

       11
       11
       +
           <input type="hidden" name="subject" value="{{ .Subject }}">

     

       12
       12
       +
           {{ template "editBasicLabels" . }}

     

       13
       13
       +
           {{ template "editKvLabels" . }}

     

       14
       14
       +
           {{ template "editLabelPanelActions" . }}

     

       15
       15
       +
           <div id="add-label-error" class="text-red-500 dark:text-red-400"></div>

     

       16
       16
       +
         </form>

     

       17
       17
       +
       {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
       {{ define "editBasicLabels" }}

     

       20
       20
       +
         {{ $defs := .Defs }}

     

       21
       21
       +
         {{ $subject := .Subject }}

     

       22
       22
       +
         {{ $state := .State }}

     

       23
       23
       +
         {{ $labelStyle := "flex items-center gap-2 rounded py-1 px-2 border border-gray-200 dark:border-gray-700 text-sm bg-white dark:bg-gray-800 text-black dark:text-white" }}

     

       24
       24
       +
         <div>

     

       25
       25
       +
           {{ template "repo/fragments/labelSectionHeaderText" "Labels" }}

     

       26
       26
       +
       

     

       27
       27
       +
           <div class="flex gap-1 items-center flex-wrap">

     

       28
       28
       +
             {{ range $k, $d := $defs }}

     

       29
       29
       +
               {{ $isChecked := $state.ContainsLabel $k }}

     

       30
       30
       +
               {{ if $d.ValueType.IsNull }}

     

       31
       31
       +
                 {{ $fieldName := $d.AtUri }}

     

       32
       32
       +
                 <label class="{{$labelStyle}}">

     

       33
       33
       +
                   <input type="checkbox" id="{{ $fieldName }}" name="{{ $fieldName }}" value="null" {{if $isChecked}}checked{{end}}>

     

       34
       34
       +
                   {{ template "labels/fragments/labelDef" $d }}

     

       35
       35
       +
                 </label>

     

       36
       36
       +
               {{ end }}

     

       37
       37
       +
             {{ else }}

     

       38
       38
       +
               <p class="text-gray-500 dark:text-gray-400 text-sm py-1">

     

       39
       39
       +
                 No labels defined yet. You can choose default labels or define custom

     

       40
       40
       +
                 labels in <a class="underline" href="/{{ $.RepoInfo.FullName }}/settings">settings</a>.

     

       41
       41
       +
               </p>

     

       42
       42
       +
             {{ end }}

     

       43
       43
       +
           </div>

     

       44
       44
       +
         </div>

     

       45
       45
       +
       {{ end }}

     

       46
       46
       +
       

     

       47
       47
       +
       {{ define "editKvLabels" }}

     

       48
       48
       +
         {{ $defs := .Defs }}

     

       49
       49
       +
         {{ $subject := .Subject }}

     

       50
       50
       +
         {{ $state := .State }}

     

       51
       51
       +
         {{ $labelStyle := "font-normal normal-case flex items-center gap-2 p-0" }}

     

       52
       52
       +
       

     

       53
       53
       +
         {{ range $k, $d := $defs }}

     

       54
       54
       +
           {{ if (not $d.ValueType.IsNull) }}

     

       55
       55
       +
             {{ $fieldName := $d.AtUri }}

     

       56
       56
       +
             {{ $valset := $state.GetValSet $k }}

     

       57
       57
       +
             <div id="label-{{$d.Id}}" class="flex flex-col gap-1">

     

       58
       58
       +
               {{ template "repo/fragments/labelSectionHeaderText" $d.Name }}

     

       59
       59
       +
                 {{ if (and $d.Multiple $d.ValueType.IsEnum) }}

     

       60
       60
       +
                   <!-- checkbox -->

     

       61
       61
       +
                   {{ range $variant := $d.ValueType.Enum }}

     

       62
       62
       +
                     <label class="{{$labelStyle}}">

     

       63
       63
       +
                       <input type="checkbox" name="{{ $fieldName }}" value="{{$variant}}" {{if $state.ContainsLabelAndVal $k $variant}}checked{{end}}>

     

       64
       64
       +
                       {{ $variant }}

     

       65
       65
       +
                     </label>

     

       66
       66
       +
                   {{ end }}

     

       67
       67
       +
                 {{ else if $d.Multiple }}

     

       68
       68
       +
                   <!-- dynamically growing input fields -->

     

       69
       69
       +
                   {{ range $v, $s := $valset }}

     

       70
       70
       +
                     {{ template "multipleInputField" (dict "def" $d "value" $v "key" $k) }}

     

       71
       71
       +
                   {{ else }}

     

       72
       72
       +
                     {{ template "multipleInputField" (dict "def" $d "value" "" "key" $k) }}

     

       73
       73
       +
                   {{ end }}

     

       74
       74
       +
                   {{ template "addFieldButton" $d }}

     

       75
       75
       +
                 {{ else if $d.ValueType.IsEnum }}

     

       76
       76
       +
                   <!-- radio buttons -->

     

       77
       77
       +
                   {{ $isUsed := $state.ContainsLabel $k }}

     

       78
       78
       +
                   {{ range $variant := $d.ValueType.Enum }}

     

       79
       79
       +
                     <label class="{{$labelStyle}}">

     

       80
       80
       +
                       <input type="radio" name="{{ $fieldName }}" value="{{$variant}}" {{if $state.ContainsLabelAndVal $k $variant}}checked{{end}}>

     

       81
       81
       +
                       {{ $variant }}

     

       82
       82
       +
                     </label>

     

       83
       83
       +
                   {{ end }}

     

       84
       84
       +
                   <label class="{{$labelStyle}}">

     

       85
       85
       +
                     <input type="radio" name="{{ $fieldName }}" value="" {{ if not $isUsed }}checked{{ end }}>

     

       86
       86
       +
                     None

     

       87
       87
       +
                   </label>

     

       88
       88
       +
                 {{ else }}

     

       89
       89
       +
                   <!-- single input field based on value type -->

     

       90
       90
       +
                   {{ range $v, $s := $valset }}

     

       91
       91
       +
                     {{ template "valueTypeInput" (dict "def" $d "value" $v "key" $k) }}

     

       92
       92
       +
                   {{ else }}

     

       93
       93
       +
                     {{ template "valueTypeInput" (dict "def" $d "value" "" "key" $k) }}

     

       94
       94
       +
                   {{ end }}

     

       95
       95
       +
                 {{ end }}

     

       96
       96
       +
             </div>

     

       97
       97
       +
           {{ end }}

     

       98
       98
       +
         {{ end }}

     

       99
       99
       +
       {{ end }}

     

       100
       100
       +
       

     

       101
       101
       +
       {{ define "multipleInputField" }}

     

       102
       102
       +
         <div class="flex gap-1 items-stretch">

     

       103
       103
       +
           {{ template "valueTypeInput" . }}

     

       104
       104
       +
           {{ template "removeFieldButton" }}

     

       105
       105
       +
         </div>

     

       106
       106
       +
       {{ end }}

     

       107
       107
       +
       

     

       108
       108
       +
       {{ define "addFieldButton" }}

     

       109
       109
       +
         <div style="display:none" id="tpl-{{ .Id }}">

     

       110
       110
       +
           {{ template "multipleInputField" (dict "def" . "value" "" "key" .AtUri.String) }}

     

       111
       111
       +
         </div>

     

       112
       112
       +
         <button type="button" onClick="this.insertAdjacentHTML('beforebegin', document.getElementById('tpl-{{ .Id }}').innerHTML)" class="w-full btn flex items-center gap-2">

     

       113
       113
       +
           {{ i "plus" "size-4" }} add

     

       114
       114
       +
         </button>

     

       115
       115
       +
       {{ end }}

     

       116
       116
       +
       

     

       117
       117
       +
       {{ define "removeFieldButton" }}

     

       118
       118
       +
         <button type="button" onClick="this.parentElement.remove()" class="btn flex items-center gap-2 text-red-400 dark:text-red-500">

     

       119
       119
       +
           {{ i "trash-2" "size-4" }}

     

       120
       120
       +
         </button>

     

       121
       121
       +
       {{ end }}

     

       122
       122
       +
       

     

       123
       123
       +
       {{ define "valueTypeInput" }}

     

       124
       124
       +
         {{ $def := .def }}

     

       125
       125
       +
         {{ $valueType := $def.ValueType }}

     

       126
       126
       +
         {{ $value := .value }}

     

       127
       127
       +
         {{ $key := .key }}

     

       128
       128
       +
       

     

       129
       129
       +
         {{ if $valueType.IsBool }}

     

       130
       130
       +
           {{ template "boolTypeInput" $ }}

     

       131
       131
       +
         {{ else if $valueType.IsInt }}

     

       132
       132
       +
           {{ template "intTypeInput" $ }}

     

       133
       133
       +
         {{ else if $valueType.IsString }}

     

       134
       134
       +
           {{ template "stringTypeInput" $ }}

     

       135
       135
       +
         {{ else if $valueType.IsNull }}

     

       136
       136
       +
           {{ template "nullTypeInput" $ }}

     

       137
       137
       +
         {{ end }}

     

       138
       138
       +
       {{ end }}

     

       139
       139
       +
       

     

       140
       140
       +
       {{ define "boolTypeInput" }}

     

       141
       141
       +
         {{ $def := .def }}

     

       142
       142
       +
         {{ $fieldName := $def.AtUri }}

     

       143
       143
       +
         {{ $value := .value }}

     

       144
       144
       +
         {{ $labelStyle = "font-normal normal-case flex items-center gap-2" }}

     

       145
       145
       +
         <div class="flex flex-col gap-1">

     

       146
       146
       +
           <label class="{{$labelStyle}}">

     

       147
       147
       +
             <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>

     

       148
       148
       +
             None

     

       149
       149
       +
           </label>

     

       150
       150
       +
           <label class="{{$labelStyle}}">

     

       151
       151
       +
             <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>

     

       152
       152
       +
             None

     

       153
       153
       +
           </label>

     

       154
       154
       +
           <label class="{{$labelStyle}}">

     

       155
       155
       +
             <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}>

     

       156
       156
       +
             None

     

       157
       157
       +
           </label>

     

       158
       158
       +
         </div>

     

       159
       159
       +
       {{ end }}

     

       160
       160
       +
       

     

       161
       161
       +
       {{ define "intTypeInput" }}

     

       162
       162
       +
         {{ $def := .def }}

     

       163
       163
       +
         {{ $fieldName := $def.AtUri }}

     

       164
       164
       +
         {{ $value := .value }}

     

       165
       165
       +
         <input class="p-1 w-full" type="number" name="{{$fieldName}}" value="{{$value}}">

     

       166
       166
       +
       {{ end }}

     

       167
       167
       +
       

     

       168
       168
       +
       {{ define "stringTypeInput" }}

     

       169
       169
       +
         {{ $def := .def }}

     

       170
       170
       +
         {{ $fieldName := $def.AtUri }}

     

       171
       171
       +
         {{ $valueType := $def.ValueType }}

     

       172
       172
       +
         {{ $value := .value }}

     

       173
       173
       +
         {{ if $valueType.IsDidFormat }}

     

       174
       174
       +
           {{ $value = trimPrefix (resolve .value) "@" }}

     

       175
       175
       +
         {{ end }}

     

       176
       176
       +
         <input class="p-1 w-full" type="text" name="{{$fieldName}}" value="{{$value}}">

     

       177
       177
       +
       {{ end }}

     

       178
       178
       +
       

     

       179
       179
       +
       {{ define "nullTypeInput" }}

     

       180
       180
       +
         {{ $def := .def }}

     

       181
       181
       +
         {{ $fieldName := $def.AtUri }}

     

       182
       182
       +
         <input class="p-1" type="hidden" name="{{$fieldName}}" value="null">

     

       183
       183
       +
       {{ end }}

     

       184
       184
       +
       

     

       185
       185
       +
       {{ define "editLabelPanelActions" }}

     

       186
       186
       +
         <div class="flex gap-2 pt-2">

     

       187
       187
       +
           <button

     

       188
       188
       +
             id="cancel-btn"

     

       189
       189
       +
             type="button"

     

       190
       190
       +
             hx-get="/{{ .RepoInfo.FullName }}/label"

     

       191
       191
       +
             hx-vals='{"subject": "{{.Subject}}"}'

     

       192
       192
       +
             hx-swap="outerHTML"

     

       193
       193
       +
             hx-target="#edit-label-panel"

     

       194
       194
       +
             class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 group">

     

       195
       195
       +
             {{ i "x" "size-4" }} cancel

     

       196
       196
       +
           </button>

     

       197
       197
       +
       

     

       198
       198
       +
           <button

     

       199
       199
       +
             id="save-btn"

     

       200
       200
       +
             type="submit"

     

       201
       201
       +
             class="btn w-1/2 flex items-center">

     

       202
       202
       +
             <span class="inline-flex gap-2 items-center">{{ i "check" "size-4" }} save</span>

     

       203
       203
       +
             <span id="spinner" class="group">

     

       204
       204
       +
               {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       205
       205
       +
             </span>

     

       206
       206
       +
           </button>

     

       207
       207
       +
         </div>

     

       208
       208
       +
       {{ end }}

+16

appview/pages/templates/repo/fragments/labelSectionHeader.html

···

       1
       1
       +
       {{ define "repo/fragments/labelSectionHeader" }}

     

       2
       2
       +
       

     

       3
       3
       +
         <div class="flex justify-between items-center gap-2">

     

       4
       4
       +
           {{ template "repo/fragments/labelSectionHeaderText" .Name }}

     

       5
       5
       +
           {{ if (or .RepoInfo.Roles.IsOwner .RepoInfo.Roles.IsCollaborator) }}

     

       6
       6
       +
             <a

     

       7
       7
       +
               class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       8
       8
       +
               hx-get="/{{ .RepoInfo.FullName }}/label/edit"

     

       9
       9
       +
               hx-vals='{"subject": "{{.Subject}}"}'

     

       10
       10
       +
               hx-swap="outerHTML"

     

       11
       11
       +
               hx-target="#label-panel">

     

       12
       12
       +
               {{ i "pencil" "size-3" }}

     

       13
       13
       +
             </a>

     

       14
       14
       +
           {{ end }}

     

       15
       15
       +
         </div>

     

       16
       16
       +
       {{ end }}

appview/pages/templates/repo/fragments/labelSectionHeaderText.html

···

       1
       1
       +
       {{ define "repo/fragments/labelSectionHeaderText" }}

     

       2
       2
       +
         <span class="text-sm py-1 font-bold text-gray-500 dark:text-gray-400 capitalize">{{ . }}</span>

     

       3
       3
       +
       {{ end }}

+138 -86

appview/pages/templates/repo/settings/fragments/addLabelDefModal.html

···

       1
       1
        
       {{ define "repo/settings/fragments/addLabelDefModal" }}

     

       2
       2
       -
       <form

     

       3
       3
       -
         hx-put="/{{ $.RepoInfo.FullName }}/settings/label"

     

       4
       4
       -
         hx-indicator="#spinner"

     

       5
       5
       -
         hx-swap="none"

     

       6
       6
       -
         hx-on::after-request="if(event.detail.successful) this.reset()"

     

       7
       7
       -
         class="flex flex-col gap-4"

     

       8
       8
       -
       >

     

       9
       9
       -
         <p class="text-gray-500 dark:text-gray-400">Labels can have a name and a value. Set the value type to "none" to create a simple label.</p>

     

       2
       2
       +
       <div class="grid grid-cols-2">

     

       3
       3
       +
         <input type="radio" name="tab" id="basic-tab" value="basic" class="hidden peer/basic" checked>

     

       4
       4
       +
         <input type="radio" name="tab" id="kv-tab" value="kv" class="hidden peer/kv">

     

       10
       5
        
       

     

       11
       11
       -
         <div class="w-full">

     

       12
       12
       -
           <label for="name">Name</label>

     

       13
       13
       -
           <input class="w-full" type="text" id="label-name" name="name" required placeholder="improvement"/>

     

       6
       6
       +
         <!-- Labels as direct siblings -->

     

       7
       7
       +
         {{ $base := "py-2 text-sm font-normal normal-case block hover:no-underline text-center cursor-pointer bg-gray-100 dark:bg-gray-800 shadow-inner border border-gray-200 dark:border-gray-700" }}

     

       8
       8
       +
         <label for="basic-tab" class="{{$base}} peer-checked/basic:bg-white peer-checked/basic:dark:bg-gray-700 peer-checked/basic:shadow-sm rounded-l">

     

       9
       9
       +
           Basic Labels

     

       10
       10
       +
         </label>

     

       11
       11
       +
         <label for="kv-tab" class="{{$base}} peer-checked/kv:bg-white peer-checked/kv:dark:bg-gray-700 peer-checked/kv:shadow-sm rounded-r">

     

       12
       12
       +
           Key-value Labels

     

       13
       13
       +
         </label>

     

       14
       14
       +
       

     

       15
       15
       +
         <!-- Basic Labels Content - direct sibling -->

     

       16
       16
       +
         <div class="mt-4 hidden peer-checked/basic:block col-span-full">

     

       17
       17
       +
           {{ template "basicLabelDef" . }}

     

       14
       18
        
         </div>

     

       15
       19
        
       

     

       16
       16
       -
          <!-- Value Type -->

     

       17
       17
       -
         <div class="w-full">

     

       18
       18
       -
           <label for="valueType">Value Type</label>

     

       19
       19
       -
           <select id="value-type" name="valueType" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       20
       20
       -
             <option value="null" selected>None</option>

     

       21
       21
       -
             <option value="string">String</option>

     

       22
       22
       -
             <option value="integer">Integer</option>

     

       23
       23
       -
             <option value="boolean">Boolean</option>

     

       24
       24
       -
           </select>

     

       25
       25
       -
           <details id="constrain-values" class="group hidden">

     

       26
       26
       -
             <summary class="list-none cursor-pointer flex items-center gap-2 py-2">

     

       27
       27
       -
               <span class="group-open:hidden inline text-gray-500 dark:text-gray-400">{{ i "square-plus" "w-4 h-4" }}</span>

     

       28
       28
       -
               <span class="hidden group-open:inline text-gray-500 dark:text-gray-400">{{ i "square-minus" "w-4 h-4" }}</span>

     

       29
       29
       -
               <span>Constrain values</span>

     

       30
       30
       -
             </summary>

     

       31
       31
       -
             <label for="enumValues">Permitted values</label>

     

       32
       32
       -
             <input type="text" id="enumValues" name="enumValues" placeholder="value1, value2, value3" class="w-full"/>

     

       33
       33
       -
             <p class="text-sm text-gray-400 dark:text-gray-500 mt-1">Enter comma-separated list of permitted values.</p>

     

       34
       34
       -
       

     

       35
       35
       -
             <label for="valueFormat">String format</label>

     

       36
       36
       -
             <select id="valueFormat" name="valueFormat" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       37
       37
       -
               <option value="any" selected>Any</option>

     

       38
       38
       -
               <option value="did">DID</option>

     

       39
       39
       -
             </select>

     

       40
       40
       -
             <p class="text-sm text-gray-400 dark:text-gray-500 mt-1">Choose a string format.</p>

     

       41
       41
       -
           </details>

     

       20
       20
       +
         <!-- Key-value Labels Content - direct sibling -->

     

       21
       21
       +
         <div class="mt-4 hidden peer-checked/kv:block col-span-full">

     

       22
       22
       +
           {{ template "kvLabelDef" . }}

     

       42
       23
        
         </div>

     

       43
       24
        
       

     

       44
       44
       -
         <!-- Scope -->

     

       25
       25
       +
         <div id="add-label-error" class="text-red-500 dark:text-red-400 col-span-full"></div>

     

       26
       26
       +
       </div>

     

       27
       27
       +
       {{ end }}

     

       28
       28
       +
       

     

       29
       29
       +
       {{ define "basicLabelDef" }}

     

       30
       30
       +
         <form

     

       31
       31
       +
           hx-put="/{{ $.RepoInfo.FullName }}/settings/label"

     

       32
       32
       +
           hx-indicator="#spinner"

     

       33
       33
       +
           hx-swap="none"

     

       34
       34
       +
           hx-on::after-request="if(event.detail.successful) this.reset()"

     

       35
       35
       +
           class="flex flex-col space-y-4">

     

       36
       36
       +
       

     

       37
       37
       +
           <p class="text-gray-500 dark:text-gray-400">These labels can have a name and a color.</p>

     

       38
       38
       +
       

     

       39
       39
       +
           {{ template "nameInput" . }}

     

       40
       40
       +
           {{ template "scopeInput" . }}

     

       41
       41
       +
           {{ template "colorInput" . }}

     

       42
       42
       +
       

     

       43
       43
       +
           <div class="flex gap-2 pt-2">

     

       44
       44
       +
             {{ template "cancelButton" . }}

     

       45
       45
       +
             {{ template "submitButton" . }}

     

       46
       46
       +
           </div>

     

       47
       47
       +
         </form>

     

       48
       48
       +
       {{ end }}

     

       49
       49
       +
       

     

       50
       50
       +
       {{ define "kvLabelDef" }}

     

       51
       51
       +
         <form

     

       52
       52
       +
           hx-put="/{{ $.RepoInfo.FullName }}/settings/label"

     

       53
       53
       +
           hx-indicator="#spinner"

     

       54
       54
       +
           hx-swap="none"

     

       55
       55
       +
           hx-on::after-request="if(event.detail.successful) this.reset()"

     

       56
       56
       +
           class="flex flex-col space-y-4">

     

       57
       57
       +
       

     

       58
       58
       +
           <p class="text-gray-500 dark:text-gray-400">

     

       59
       59
       +
             These labels are more detailed, they can have a key and an associated

     

       60
       60
       +
             value. You may define additional constraints on label values.

     

       61
       61
       +
           </p>

     

       62
       62
       +
       

     

       63
       63
       +
           {{ template "nameInput" . }}

     

       64
       64
       +
           {{ template "valueInput" . }}

     

       65
       65
       +
           {{ template "multipleInput" . }}

     

       66
       66
       +
           {{ template "scopeInput" . }}

     

       67
       67
       +
           {{ template "colorInput" . }}

     

       68
       68
       +
       

     

       69
       69
       +
           <div class="flex gap-2 pt-2">

     

       70
       70
       +
             {{ template "cancelButton" . }}

     

       71
       71
       +
             {{ template "submitButton" . }}

     

       72
       72
       +
           </div>

     

       73
       73
       +
         </form>

     

       74
       74
       +
       {{ end }}

     

       75
       75
       +
       

     

       76
       76
       +
       {{ define "nameInput" }}

     

       45
       77
        
         <div class="w-full">

     

       46
       46
       -
           <label for="scope">Scope</label>

     

       47
       47
       -
           <select id="scope" name="scope" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       48
       48
       -
             <option value="sh.tangled.repo.issue">Issues</option>

     

       49
       49
       -
             <option value="sh.tangled.repo.pull">Pull Requests</option>

     

       50
       50
       -
           </select>

     

       78
       78
       +
           <label for="name">Name</label>

     

       79
       79
       +
           <input class="w-full" type="text" id="label-name" name="name" required placeholder="improvement"/>

     

       51
       80
        
         </div>

     

       81
       81
       +
       {{ end }}

     

       52
       82
        
       

     

       53
       53
       -
         <!-- Color -->

     

       83
       83
       +
       {{ define "colorInput" }}

     

       54
       84
        
         <div class="w-full">

     

       55
       85
        
           <label for="color">Color</label>

     

       56
       86
        
           <div class="grid grid-cols-4 grid-rows-2 place-items-center">

     
···

       63
       93
        
             {{ end }}

     

       64
       94
        
           </div>

     

       65
       95
        
         </div>

     

       96
       96
       +
       {{ end }}

     

       66
       97
        
       

     

       67
       67
       -
         <!-- Multiple -->

     

       68
       68
       -
         <div class="w-full flex flex-wrap gap-2">

     

       69
       69
       -
           <input type="checkbox" id="multiple" name="multiple" value="true" />

     

       70
       70
       -
           <span>

     

       71
       71
       -
             Allow multiple values

     

       72
       72
       -
           </span>

     

       98
       98
       +
       {{ define "scopeInput" }}

     

       99
       99
       +
         <div class="w-full">

     

       100
       100
       +
           <label>Scope</label>

     

       101
       101
       +
           <label class="font-normal normal-case flex items-center gap-2 p-0">

     

       102
       102
       +
             <input type="checkbox" id="issue-scope" name="scope" value="sh.tangled.repo.issue" checked />

     

       103
       103
       +
             Issues

     

       104
       104
       +
           </label>

     

       105
       105
       +
           <label class="font-normal normal-case flex items-center gap-2 p-0">

     

       106
       106
       +
             <input type="checkbox" id="pulls-scope" name="scope" value="sh.tangled.repo.pull" checked />

     

       107
       107
       +
             Pull Requests

     

       108
       108
       +
           </label>

     

       109
       109
       +
         </div>

     

       110
       110
       +
       {{ end }}

     

       111
       111
       +
       

     

       112
       112
       +
       {{ define "valueInput" }}

     

       113
       113
       +
         <div class="w-full">

     

       114
       114
       +
           <label for="valueType">Value Type</label>

     

       115
       115
       +
           <select id="value-type" name="valueType" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       116
       116
       +
             <option value="string">String</option>

     

       117
       117
       +
             <option value="integer">Integer</option>

     

       118
       118
       +
           </select>

     

       73
       119
        
         </div>

     

       74
       120
        
       

     

       75
       75
       -
         <div class="flex gap-2 pt-2">

     

       76
       76
       -
           <button

     

       77
       77
       -
             type="button"

     

       78
       78
       -
             popovertarget="add-labeldef-modal"

     

       79
       79
       -
             popovertargetaction="hide"

     

       80
       80
       -
             class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"

     

       81
       81
       -
             >

     

       82
       82
       -
             {{ i "x" "size-4" }} cancel

     

       83
       83
       -
           </button>

     

       84
       84
       -
           <button type="submit" class="btn w-1/2 flex items-center">

     

       85
       85
       -
             <span class="inline-flex gap-2 items-center">{{ i "plus" "size-4" }} add</span>

     

       86
       86
       -
             <span id="spinner" class="group">

     

       87
       87
       -
               {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       88
       88
       -
             </span>

     

       89
       89
       -
           </button>

     

       121
       121
       +
         <div class="w-full">

     

       122
       122
       +
           <label for="enumValues">Permitted values</label>

     

       123
       123
       +
           <input type="text" id="enumValues" name="enumValues" placeholder="value1, value2, value3" class="w-full"/>

     

       124
       124
       +
           <p class="text-sm text-gray-400 dark:text-gray-500 mt-1">

     

       125
       125
       +
           Enter comma-separated list of permitted values, or leave empty to allow any value.

     

       126
       126
       +
           </p>

     

       90
       127
        
         </div>

     

       91
       91
       -
         <div id="add-label-error" class="text-red-500 dark:text-red-400"></div>

     

       92
       92
       -
       </form>

     

       93
       93
       -
       

     

       94
       94
       -
       <script>

     

       95
       95
       -
         document.getElementById('value-type').addEventListener('change', function() {

     

       96
       96
       -
           const constrainValues = document.getElementById('constrain-values');

     

       97
       97
       -
           const selectedValue = this.value;

     

       98
       98
       -
       

     

       99
       99
       -
           if (selectedValue === 'string') {

     

       100
       100
       -
             constrainValues.classList.remove('hidden');

     

       101
       101
       -
           } else {

     

       102
       102
       -
             constrainValues.classList.add('hidden');

     

       103
       103
       -
             constrainValues.removeAttribute('open');

     

       104
       104
       -
             document.getElementById('enumValues').value = '';

     

       105
       105
       -
           }

     

       106
       106
       -
         });

     

       107
       107
       -
       

     

       108
       108
       -
         function toggleDarkMode() {

     

       109
       109
       -
           document.documentElement.classList.toggle('dark');

     

       110
       110
       -
         }

     

       111
       111
       -
       </script>

     

       128
       128
       +
       

     

       129
       129
       +
         <div class="w-full">

     

       130
       130
       +
           <label for="valueFormat">String format</label>

     

       131
       131
       +
           <select id="valueFormat" name="valueFormat" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600">

     

       132
       132
       +
             <option value="any" selected>Any</option>

     

       133
       133
       +
             <option value="did">DID</option>

     

       134
       134
       +
           </select>

     

       135
       135
       +
         </div>

     

       136
       136
       +
       {{ end }}

     

       137
       137
       +
       

     

       138
       138
       +
       {{ define "multipleInput" }}

     

       139
       139
       +
        <div class="w-full flex flex-wrap gap-2">

     

       140
       140
       +
          <input type="checkbox" id="multiple" name="multiple" value="true" />

     

       141
       141
       +
          <span>Allow multiple values</span>

     

       142
       142
       +
        </div>

     

       112
       143
        
       {{ end }}

     

       113
       144
        
       

     

       145
       145
       +
       {{ define "cancelButton" }}

     

       146
       146
       +
         <button

     

       147
       147
       +
           type="button"

     

       148
       148
       +
           popovertarget="add-labeldef-modal"

     

       149
       149
       +
           popovertargetaction="hide"

     

       150
       150
       +
           class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"

     

       151
       151
       +
           >

     

       152
       152
       +
           {{ i "x" "size-4" }} cancel

     

       153
       153
       +
         </button>

     

       154
       154
       +
       {{ end }}

     

       155
       155
       +
       

     

       156
       156
       +
       {{ define "submitButton" }}

     

       157
       157
       +
         <button type="submit" class="btn-create w-1/2 flex items-center">

     

       158
       158
       +
           <span class="inline-flex gap-2 items-center">{{ i "plus" "size-4" }} add</span>

     

       159
       159
       +
           <span id="spinner" class="group">

     

       160
       160
       +
             {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       161
       161
       +
           </span>

     

       162
       162
       +
         </button>

     

       163
       163
       +
       {{ end }}

     

       164
       164
       +
       

     

       165
       165
       +

+4 -7

appview/pages/templates/repo/issues/issues.html

···

       80
       80
        
                 <a href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a>

     

       81
       81
        
               </span>

     

       82
       82
        
       

     

       83
       83
       -
               {{ if .Labels.Inner }}

     

       84
       84
       -
                 <span class="before:content-['·']"></span>

     

       85
       85
       -
                 {{ range $k, $valset := .Labels.Inner }}

     

       86
       86
       -
                   {{ $d := index $.LabelDefs $k }}

     

       87
       87
       -
                   {{ range $v, $s := $valset }}

     

       88
       88
       -
                     {{ template "labels/fragments/label" (dict "def" $d "val" $v) }}

     

       89
       89
       -
                   {{ end }}

     

       83
       83
       +
               {{ $state := .Labels }}

     

       84
       84
       +
               {{ range $k, $d := $.LabelDefs }}

     

       85
       85
       +
                 {{ range $v, $s := $state.GetValSet $d.AtUri.String }}

     

       86
       86
       +
                   {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}

     

       90
       87
        
                 {{ end }}

     

       91
       88
        
               {{ end }}

     

       92
       89
        
             </div>

+25 -27

appview/pages/templates/repo/settings/fragments/labelListing.html

···

       1
       1
        
       {{ define "repo/settings/fragments/labelListing" }}

     

       2
       2
        
         {{ $root := index . 0 }}

     

       3
       3
        
         {{ $label := index . 1 }}

     

       4
       4
       -
         <div id="label-{{$label.Id}}" class="flex items-center justify-between p-2 pl-4">

     

       5
       5
       -
           <div class="flex flex-col gap-1 text-sm min-w-0 max-w-[80%]">

     

       6
       6
       -
             {{ template "labels/fragments/labelDef" $label }}

     

       7
       7
       -
             <div class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400">

     

       4
       4
       +
         <div class="flex flex-col gap-1 text-sm min-w-0 max-w-[80%]">

     

       5
       5
       +
           {{ template "labels/fragments/labelDef" $label }}

     

       6
       6
       +
           <div class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400">

     

       7
       7
       +
             {{ if $label.ValueType.IsNull }} 

     

       8
       8
       +
               basic

     

       9
       9
       +
             {{ else }}

     

       8
       10
        
               {{ $label.ValueType.Type }} type

     

       9
       9
       -
               {{ if $label.ValueType.IsEnumType }}

     

       10
       10
       -
                 <span class="before:content-['·'] before:select-none"></span>

     

       11
       11
       -
                 {{ join $label.ValueType.Enum ", " }}

     

       12
       12
       -
               {{ end }}

     

       13
       13
       -
               {{ if $label.ValueType.IsDidFormat }}

     

       14
       14
       -
                 <span class="before:content-['·'] before:select-none"></span>

     

       15
       15
       -
                 DID format

     

       16
       16
       -
               {{ end }}

     

       17
       17
       -
             </div>

     

       11
       11
       +
             {{ end }}

     

       12
       12
       +
       

     

       13
       13
       +
             {{ if $label.ValueType.IsEnum }}

     

       14
       14
       +
               <span class="before:content-['·'] before:select-none"></span>

     

       15
       15
       +
               {{ join $label.ValueType.Enum ", " }}

     

       16
       16
       +
             {{ end }}

     

       17
       17
       +
       

     

       18
       18
       +
             {{ if $label.ValueType.IsDidFormat }}

     

       19
       19
       +
               <span class="before:content-['·'] before:select-none"></span>

     

       20
       20
       +
               DID format

     

       21
       21
       +
             {{ end }}

     

       22
       22
       +
       

     

       23
       23
       +
             {{ if $label.Multiple }}

     

       24
       24
       +
               <span class="before:content-['·'] before:select-none"></span>

     

       25
       25
       +
               multiple

     

       26
       26
       +
             {{ end }}

     

       27
       27
       +
       

     

       28
       28
       +
             <span class="before:content-['·'] before:select-none"></span>

     

       29
       29
       +
             {{ join $label.Scope ", " }}

     

       18
       30
        
           </div>

     

       19
       19
       -
           {{ if $root.RepoInfo.Roles.IsOwner }}

     

       20
       20
       -
             <button

     

       21
       21
       -
               class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       22
       22
       -
               title="Delete label"

     

       23
       23
       -
               hx-delete="/{{ $root.RepoInfo.FullName }}/settings/label"

     

       24
       24
       -
               hx-swap="none"

     

       25
       25
       -
               hx-vals='{"label-id": "{{ $label.Id }}"}'

     

       26
       26
       -
               hx-confirm="Are you sure you want to delete the label `{{ $label.Name }}`?"

     

       27
       27
       -
             >

     

       28
       28
       -
               {{ i "trash-2" "w-5 h-5" }}

     

       29
       29
       -
               <span class="hidden md:inline">delete</span> 

     

       30
       30
       -
               {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       31
       31
       -
             </button>

     

       32
       32
       -
           {{ end }}

     

       33
       31
        
         </div>

     

       34
       32
        
       {{ end }}

consts/consts.go

···

       1
       1
       +
       package consts

     

       2
       2
       +
       

     

       3
       3
       +
       const (

     

       4
       4
       +
       	TangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli"

     

       5
       5
       +
       	IcyDid     = "did:plc:hwevmowznbiukdf6uk5dwrrq"

     

       6
       6
       +
       

     

       7
       7
       +
       	DefaultSpindle = "spindle.tangled.sh"

     

       8
       8
       +
       	DefaultKnot    = "knot1.tangled.sh"

     

       9
       9
       +
       )

+5 -25

appview/db/artifact.go

···

       5
       5
        
       	"strings"

     

       6
       6
        
       	"time"

     

       7
       7
        
       

     

       8
       8
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       9
       8
        
       	"github.com/go-git/go-git/v5/plumbing"

     

       10
       9
        
       	"github.com/ipfs/go-cid"

     

       11
       11
       -
       	"tangled.org/core/api/tangled"

     

       10
       10
       +
       	"tangled.org/core/appview/models"

     

       12
       11
        
       )

     

       13
       12
        
       

     

       14
       14
       -
       type Artifact struct {

     

       15
       15
       -
       	Id   uint64

     

       16
       16
       -
       	Did  string

     

       17
       17
       -
       	Rkey string

     

       18
       18
       -
       

     

       19
       19
       -
       	RepoAt    syntax.ATURI

     

       20
       20
       -
       	Tag       plumbing.Hash

     

       21
       21
       -
       	CreatedAt time.Time

     

       22
       22
       -
       

     

       23
       23
       -
       	BlobCid  cid.Cid

     

       24
       24
       -
       	Name     string

     

       25
       25
       -
       	Size     uint64

     

       26
       26
       -
       	MimeType string

     

       27
       27
       -
       }

     

       28
       28
       -
       

     

       29
       29
       -
       func (a *Artifact) ArtifactAt() syntax.ATURI {

     

       30
       30
       -
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", a.Did, tangled.RepoArtifactNSID, a.Rkey))

     

       31
       31
       -
       }

     

       32
       32
       -
       

     

       33
       33
       -
       func AddArtifact(e Execer, artifact Artifact) error {

     

       13
       13
       +
       func AddArtifact(e Execer, artifact models.Artifact) error {

     

       34
       14
        
       	_, err := e.Exec(

     

       35
       15
        
       		`insert or ignore into artifacts (

     

       36
       16
        
       			did,

     
···

       57
       37
        
       	return err

     

       58
       38
        
       }

     

       59
       39
        
       

     

       60
       60
       -
       func GetArtifact(e Execer, filters ...filter) ([]Artifact, error) {

     

       61
       61
       -
       	var artifacts []Artifact

     

       40
       40
       +
       func GetArtifact(e Execer, filters ...filter) ([]models.Artifact, error) {

     

       41
       41
       +
       	var artifacts []models.Artifact

     

       62
       42
        
       

     

       63
       43
        
       	var conditions []string

     

       64
       44
        
       	var args []any

     
···

       94
       74
        
       	defer rows.Close()

     

       95
       75
        
       

     

       96
       76
        
       	for rows.Next() {

     

       97
       97
       -
       		var artifact Artifact

     

       77
       77
       +
       		var artifact models.Artifact

     

       98
       78
        
       		var createdAt string

     

       99
       79
        
       		var tag []byte

     

       100
       80
        
       		var blobCid string

+30

appview/models/artifact.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       9
       9
       +
       	"github.com/ipfs/go-cid"

     

       10
       10
       +
       	"tangled.org/core/api/tangled"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       type Artifact struct {

     

       14
       14
       +
       	Id   uint64

     

       15
       15
       +
       	Did  string

     

       16
       16
       +
       	Rkey string

     

       17
       17
       +
       

     

       18
       18
       +
       	RepoAt    syntax.ATURI

     

       19
       19
       +
       	Tag       plumbing.Hash

     

       20
       20
       +
       	CreatedAt time.Time

     

       21
       21
       +
       

     

       22
       22
       +
       	BlobCid  cid.Cid

     

       23
       23
       +
       	Name     string

     

       24
       24
       +
       	Size     uint64

     

       25
       25
       +
       	MimeType string

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       func (a *Artifact) ArtifactAt() syntax.ATURI {

     

       29
       29
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", a.Did, tangled.RepoArtifactNSID, a.Rkey))

     

       30
       30
       +
       }

+21

appview/models/collaborator.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type Collaborator struct {

     

       10
       10
       +
       	// identifiers for the record

     

       11
       11
       +
       	Id   int64

     

       12
       12
       +
       	Did  syntax.DID

     

       13
       13
       +
       	Rkey string

     

       14
       14
       +
       

     

       15
       15
       +
       	// content

     

       16
       16
       +
       	SubjectDid syntax.DID

     

       17
       17
       +
       	RepoAt     syntax.ATURI

     

       18
       18
       +
       

     

       19
       19
       +
       	// meta

     

       20
       20
       +
       	Created time.Time

     

       21
       21
       +
       }

+16

appview/models/email.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       type Email struct {

     

       8
       8
       +
       	ID               int64

     

       9
       9
       +
       	Did              string

     

       10
       10
       +
       	Address          string

     

       11
       11
       +
       	Verified         bool

     

       12
       12
       +
       	Primary          bool

     

       13
       13
       +
       	VerificationCode string

     

       14
       14
       +
       	LastSent         *time.Time

     

       15
       15
       +
       	CreatedAt        time.Time

     

       16
       16
       +
       }

+26 -57

appview/db/follow.go

···

       5
       5
        
       	"log"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
       -
       )

     

       9
       8
        
       

     

       10
       10
       -
       type Follow struct {

     

       11
       11
       -
       	UserDid    string

     

       12
       12
       -
       	SubjectDid string

     

       13
       13
       -
       	FollowedAt time.Time

     

       14
       14
       -
       	Rkey       string

     

       15
       15
       -
       }

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       10
       10
       +
       )

     

       16
       11
        
       

     

       17
       17
       -
       func AddFollow(e Execer, follow *Follow) error {

     

       12
       12
       +
       func AddFollow(e Execer, follow *models.Follow) error {

     

       18
       13
        
       	query := `insert or ignore into follows (user_did, subject_did, rkey) values (?, ?, ?)`

     

       19
       14
        
       	_, err := e.Exec(query, follow.UserDid, follow.SubjectDid, follow.Rkey)

     

       20
       15
        
       	return err

     

       21
       16
        
       }

     

       22
       17
        
       

     

       23
       18
        
       // Get a follow record

     

       24
       24
       -
       func GetFollow(e Execer, userDid, subjectDid string) (*Follow, error) {

     

       19
       19
       +
       func GetFollow(e Execer, userDid, subjectDid string) (*models.Follow, error) {

     

       25
       20
        
       	query := `select user_did, subject_did, followed_at, rkey from follows where user_did = ? and subject_did = ?`

     

       26
       21
        
       	row := e.QueryRow(query, userDid, subjectDid)

     

       27
       22
        
       

     

       28
       28
       -
       	var follow Follow

     

       23
       23
       +
       	var follow models.Follow

     

       29
       24
        
       	var followedAt string

     

       30
       25
        
       	err := row.Scan(&follow.UserDid, &follow.SubjectDid, &followedAt, &follow.Rkey)

     

       31
       26
        
       	if err != nil {

     
···

       55
       50
        
       	return err

     

       56
       51
        
       }

     

       57
       52
        
       

     

       58
       58
       -
       type FollowStats struct {

     

       59
       59
       -
       	Followers int64

     

       60
       60
       -
       	Following int64

     

       61
       61
       -
       }

     

       62
       62
       -
       

     

       63
       63
       -
       func GetFollowerFollowingCount(e Execer, did string) (FollowStats, error) {

     

       53
       53
       +
       func GetFollowerFollowingCount(e Execer, did string) (models.FollowStats, error) {

     

       64
       54
        
       	var followers, following int64

     

       65
       55
        
       	err := e.QueryRow(

     

       66
       56
        
       		`SELECT

     
···

       68
       58
        
       		COUNT(CASE WHEN user_did = ? THEN 1 END) AS following

     

       69
       59
        
       		FROM follows;`, did, did).Scan(&followers, &following)

     

       70
       60
        
       	if err != nil {

     

       71
       71
       -
       		return FollowStats{}, err

     

       61
       61
       +
       		return models.FollowStats{}, err

     

       72
       62
        
       	}

     

       73
       73
       -
       	return FollowStats{

     

       63
       63
       +
       	return models.FollowStats{

     

       74
       64
        
       		Followers: followers,

     

       75
       65
        
       		Following: following,

     

       76
       66
        
       	}, nil

     

       77
       67
        
       }

     

       78
       68
        
       

     

       79
       79
       -
       func GetFollowerFollowingCounts(e Execer, dids []string) (map[string]FollowStats, error) {

     

       69
       69
       +
       func GetFollowerFollowingCounts(e Execer, dids []string) (map[string]models.FollowStats, error) {

     

       80
       70
        
       	if len(dids) == 0 {

     

       81
       71
        
       		return nil, nil

     

       82
       72
        
       	}

     
···

       112
       102
        
       		) g on f.did = g.did`,

     

       113
       103
        
       		placeholderStr, placeholderStr)

     

       114
       104
        
       

     

       115
       115
       -
       	result := make(map[string]FollowStats)

     

       105
       105
       +
       	result := make(map[string]models.FollowStats)

     

       116
       106
        
       

     

       117
       107
        
       	rows, err := e.Query(query, args...)

     

       118
       108
        
       	if err != nil {

     
···

       126
       116
        
       		if err := rows.Scan(&did, &followers, &following); err != nil {

     

       127
       117
        
       			return nil, err

     

       128
       118
        
       		}

     

       129
       129
       -
       		result[did] = FollowStats{

     

       119
       119
       +
       		result[did] = models.FollowStats{

     

       130
       120
        
       			Followers: followers,

     

       131
       121
        
       			Following: following,

     

       132
       122
        
       		}

     
···

       134
       124
        
       

     

       135
       125
        
       	for _, did := range dids {

     

       136
       126
        
       		if _, exists := result[did]; !exists {

     

       137
       137
       -
       			result[did] = FollowStats{

     

       127
       127
       +
       			result[did] = models.FollowStats{

     

       138
       128
        
       				Followers: 0,

     

       139
       129
        
       				Following: 0,

     

       140
       130
        
       			}

     
···

       144
       134
        
       	return result, nil

     

       145
       135
        
       }

     

       146
       136
        
       

     

       147
       147
       -
       func GetFollows(e Execer, limit int, filters ...filter) ([]Follow, error) {

     

       148
       148
       -
       	var follows []Follow

     

       137
       137
       +
       func GetFollows(e Execer, limit int, filters ...filter) ([]models.Follow, error) {

     

       138
       138
       +
       	var follows []models.Follow

     

       149
       139
        
       

     

       150
       140
        
       	var conditions []string

     

       151
       141
        
       	var args []any

     
···

       177
       167
        
       		return nil, err

     

       178
       168
        
       	}

     

       179
       169
        
       	for rows.Next() {

     

       180
       180
       -
       		var follow Follow

     

       170
       170
       +
       		var follow models.Follow

     

       181
       171
        
       		var followedAt string

     

       182
       172
        
       		err := rows.Scan(

     

       183
       173
        
       			&follow.UserDid,

     
···

       200
       190
        
       	return follows, nil

     

       201
       191
        
       }

     

       202
       192
        
       

     

       203
       203
       -
       func GetFollowers(e Execer, did string) ([]Follow, error) {

     

       193
       193
       +
       func GetFollowers(e Execer, did string) ([]models.Follow, error) {

     

       204
       194
        
       	return GetFollows(e, 0, FilterEq("subject_did", did))

     

       205
       195
        
       }

     

       206
       196
        
       

     

       207
       207
       -
       func GetFollowing(e Execer, did string) ([]Follow, error) {

     

       197
       197
       +
       func GetFollowing(e Execer, did string) ([]models.Follow, error) {

     

       208
       198
        
       	return GetFollows(e, 0, FilterEq("user_did", did))

     

       209
       199
        
       }

     

       210
       200
        
       

     

       211
       211
       -
       type FollowStatus int

     

       212
       212
       -
       

     

       213
       213
       -
       const (

     

       214
       214
       -
       	IsNotFollowing FollowStatus = iota

     

       215
       215
       -
       	IsFollowing

     

       216
       216
       -
       	IsSelf

     

       217
       217
       -
       )

     

       218
       218
       -
       

     

       219
       219
       -
       func (s FollowStatus) String() string {

     

       220
       220
       -
       	switch s {

     

       221
       221
       -
       	case IsNotFollowing:

     

       222
       222
       -
       		return "IsNotFollowing"

     

       223
       223
       -
       	case IsFollowing:

     

       224
       224
       -
       		return "IsFollowing"

     

       225
       225
       -
       	case IsSelf:

     

       226
       226
       -
       		return "IsSelf"

     

       227
       227
       -
       	default:

     

       228
       228
       -
       		return "IsNotFollowing"

     

       229
       229
       -
       	}

     

       230
       230
       -
       }

     

       231
       231
       -
       

     

       232
       232
       -
       func getFollowStatuses(e Execer, userDid string, subjectDids []string) (map[string]FollowStatus, error) {

     

       201
       201
       +
       func getFollowStatuses(e Execer, userDid string, subjectDids []string) (map[string]models.FollowStatus, error) {

     

       233
       202
        
       	if len(subjectDids) == 0 || userDid == "" {

     

       234
       234
       -
       		return make(map[string]FollowStatus), nil

     

       203
       203
       +
       		return make(map[string]models.FollowStatus), nil

     

       235
       204
        
       	}

     

       236
       205
        
       

     

       237
       237
       -
       	result := make(map[string]FollowStatus)

     

       206
       206
       +
       	result := make(map[string]models.FollowStatus)

     

       238
       207
        
       

     

       239
       208
        
       	for _, subjectDid := range subjectDids {

     

       240
       209
        
       		if userDid == subjectDid {

     

       241
       241
       -
       			result[subjectDid] = IsSelf

     

       210
       210
       +
       			result[subjectDid] = models.IsSelf

     

       242
       211
        
       		} else {

     

       243
       243
       -
       			result[subjectDid] = IsNotFollowing

     

       212
       212
       +
       			result[subjectDid] = models.IsNotFollowing

     

       244
       213
        
       		}

     

       245
       214
        
       	}

     

       246
       215
        
       

     
···

       281
       250
        
       		if err := rows.Scan(&subjectDid); err != nil {

     

       282
       251
        
       			return nil, err

     

       283
       252
        
       		}

     

       284
       284
       -
       		result[subjectDid] = IsFollowing

     

       253
       253
       +
       		result[subjectDid] = models.IsFollowing

     

       285
       254
        
       	}

     

       286
       255
        
       

     

       287
       256
        
       	return result, nil

     

       288
       257
        
       }

     

       289
       258
        
       

     

       290
       290
       -
       func GetFollowStatus(e Execer, userDid, subjectDid string) FollowStatus {

     

       259
       259
       +
       func GetFollowStatus(e Execer, userDid, subjectDid string) models.FollowStatus {

     

       291
       260
        
       	statuses, err := getFollowStatuses(e, userDid, []string{subjectDid})

     

       292
       261
        
       	if err != nil {

     

       293
       293
       -
       		return IsNotFollowing

     

       262
       262
       +
       		return models.IsNotFollowing

     

       294
       263
        
       	}

     

       295
       264
        
       	return statuses[subjectDid]

     

       296
       265
        
       }

     

       297
       266
        
       

     

       298
       298
       -
       func GetFollowStatuses(e Execer, userDid string, subjectDids []string) (map[string]FollowStatus, error) {

     

       267
       267
       +
       func GetFollowStatuses(e Execer, userDid string, subjectDids []string) (map[string]models.FollowStatus, error) {

     

       299
       268
        
       	return getFollowStatuses(e, userDid, subjectDids)

     

       300
       269
        
       }

+38

appview/models/follow.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       type Follow struct {

     

       8
       8
       +
       	UserDid    string

     

       9
       9
       +
       	SubjectDid string

     

       10
       10
       +
       	FollowedAt time.Time

     

       11
       11
       +
       	Rkey       string

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       type FollowStats struct {

     

       15
       15
       +
       	Followers int64

     

       16
       16
       +
       	Following int64

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       type FollowStatus int

     

       20
       20
       +
       

     

       21
       21
       +
       const (

     

       22
       22
       +
       	IsNotFollowing FollowStatus = iota

     

       23
       23
       +
       	IsFollowing

     

       24
       24
       +
       	IsSelf

     

       25
       25
       +
       )

     

       26
       26
       +
       

     

       27
       27
       +
       func (s FollowStatus) String() string {

     

       28
       28
       +
       	switch s {

     

       29
       29
       +
       	case IsNotFollowing:

     

       30
       30
       +
       		return "IsNotFollowing"

     

       31
       31
       +
       	case IsFollowing:

     

       32
       32
       +
       		return "IsFollowing"

     

       33
       33
       +
       	case IsSelf:

     

       34
       34
       +
       		return "IsSelf"

     

       35
       35
       +
       	default:

     

       36
       36
       +
       		return "IsNotFollowing"

     

       37
       37
       +
       	}

     

       38
       38
       +
       }

+4 -3

appview/state/follow.go

···

       9
       9
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       10
       10
        
       	"tangled.org/core/api/tangled"

     

       11
       11
        
       	"tangled.org/core/appview/db"

     

       12
       12
       +
       	"tangled.org/core/appview/models"

     

       12
       13
        
       	"tangled.org/core/appview/pages"

     

       13
       14
        
       	"tangled.org/core/tid"

     

       14
       15
        
       )

     
···

       59
       60
        
       

     

       60
       61
        
       		log.Println("created atproto record: ", resp.Uri)

     

       61
       62
        
       

     

       62
       62
       -
       		follow := &db.Follow{

     

       63
       63
       +
       		follow := &models.Follow{

     

       63
       64
        
       			UserDid:    currentUser.Did,

     

       64
       65
        
       			SubjectDid: subjectIdent.DID.String(),

     

       65
       66
        
       			Rkey:       rkey,

     
···

       75
       76
        
       

     

       76
       77
        
       		s.pages.FollowFragment(w, pages.FollowFragmentParams{

     

       77
       78
        
       			UserDid:      subjectIdent.DID.String(),

     

       78
       78
       -
       			FollowStatus: db.IsFollowing,

     

       79
       79
       +
       			FollowStatus: models.IsFollowing,

     

       79
       80
        
       		})

     

       80
       81
        
       

     

       81
       82
        
       		return

     
···

       106
       107
        
       

     

       107
       108
        
       		s.pages.FollowFragment(w, pages.FollowFragmentParams{

     

       108
       109
        
       			UserDid:      subjectIdent.DID.String(),

     

       109
       109
       -
       			FollowStatus: db.IsNotFollowing,

     

       110
       110
       +
       			FollowStatus: models.IsNotFollowing,

     

       110
       111
        
       		})

     

       111
       112
        
       

     

       112
       113
        
       		s.notifier.DeleteFollow(r.Context(), follow)

+2 -1

appview/knots/knots.go

···

       13
       13
        
       	"tangled.org/core/appview/config"

     

       14
       14
        
       	"tangled.org/core/appview/db"

     

       15
       15
        
       	"tangled.org/core/appview/middleware"

     

       16
       16
       +
       	"tangled.org/core/appview/models"

     

       16
       17
        
       	"tangled.org/core/appview/oauth"

     

       17
       18
        
       	"tangled.org/core/appview/pages"

     

       18
       19
        
       	"tangled.org/core/appview/serververify"

     
···

       119
       120
        
       	}

     

       120
       121
        
       

     

       121
       122
        
       	// organize repos by did

     

       122
       122
       -
       	repoMap := make(map[string][]db.Repo)

     

       123
       123
       +
       	repoMap := make(map[string][]models.Repo)

     

       123
       124
        
       	for _, r := range repos {

     

       124
       125
        
       		repoMap[r.Did] = append(repoMap[r.Did], r)

     

       125
       126
        
       	}

+4 -4

appview/state/git_http.go

···

       8
       8
        
       

     

       9
       9
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       10
       10
        
       	"github.com/go-chi/chi/v5"

     

       11
       11
       -
       	"tangled.org/core/appview/db"

     

       11
       11
       +
       	"tangled.org/core/appview/models"

     

       12
       12
        
       )

     

       13
       13
        
       

     

       14
       14
        
       func (s *State) InfoRefs(w http.ResponseWriter, r *http.Request) {

     

       15
       15
        
       	user := r.Context().Value("resolvedId").(identity.Identity)

     

       16
       16
       -
       	repo := r.Context().Value("repo").(*db.Repo)

     

       16
       16
       +
       	repo := r.Context().Value("repo").(*models.Repo)

     

       17
       17
        
       

     

       18
       18
        
       	scheme := "https"

     

       19
       19
        
       	if s.config.Core.Dev {

     
···

       31
       31
        
       		http.Error(w, "failed to resolve user", http.StatusInternalServerError)

     

       32
       32
        
       		return

     

       33
       33
        
       	}

     

       34
       34
       -
       	repo := r.Context().Value("repo").(*db.Repo)

     

       34
       34
       +
       	repo := r.Context().Value("repo").(*models.Repo)

     

       35
       35
        
       

     

       36
       36
        
       	scheme := "https"

     

       37
       37
        
       	if s.config.Core.Dev {

     
···

       48
       48
        
       		http.Error(w, "failed to resolve user", http.StatusInternalServerError)

     

       49
       49
        
       		return

     

       50
       50
        
       	}

     

       51
       51
       -
       	repo := r.Context().Value("repo").(*db.Repo)

     

       51
       51
       +
       	repo := r.Context().Value("repo").(*models.Repo)

     

       52
       52
        
       

     

       53
       53
        
       	scheme := "https"

     

       54
       54
        
       	if s.config.Core.Dev {

+194

appview/models/issue.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"sort"

     

       6
       6
       +
       	"time"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       9
       9
       +
       	"tangled.org/core/api/tangled"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       type Issue struct {

     

       13
       13
       +
       	Id      int64

     

       14
       14
       +
       	Did     string

     

       15
       15
       +
       	Rkey    string

     

       16
       16
       +
       	RepoAt  syntax.ATURI

     

       17
       17
       +
       	IssueId int

     

       18
       18
       +
       	Created time.Time

     

       19
       19
       +
       	Edited  *time.Time

     

       20
       20
       +
       	Deleted *time.Time

     

       21
       21
       +
       	Title   string

     

       22
       22
       +
       	Body    string

     

       23
       23
       +
       	Open    bool

     

       24
       24
       +
       

     

       25
       25
       +
       	// optionally, populate this when querying for reverse mappings

     

       26
       26
       +
       	// like comment counts, parent repo etc.

     

       27
       27
       +
       	Comments []IssueComment

     

       28
       28
       +
       	Labels   LabelState

     

       29
       29
       +
       	Repo     *Repo

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       func (i *Issue) AtUri() syntax.ATURI {

     

       33
       33
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueNSID, i.Rkey))

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       func (i *Issue) AsRecord() tangled.RepoIssue {

     

       37
       37
       +
       	return tangled.RepoIssue{

     

       38
       38
       +
       		Repo:      i.RepoAt.String(),

     

       39
       39
       +
       		Title:     i.Title,

     

       40
       40
       +
       		Body:      &i.Body,

     

       41
       41
       +
       		CreatedAt: i.Created.Format(time.RFC3339),

     

       42
       42
       +
       	}

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       func (i *Issue) State() string {

     

       46
       46
       +
       	if i.Open {

     

       47
       47
       +
       		return "open"

     

       48
       48
       +
       	}

     

       49
       49
       +
       	return "closed"

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       type CommentListItem struct {

     

       53
       53
       +
       	Self    *IssueComment

     

       54
       54
       +
       	Replies []*IssueComment

     

       55
       55
       +
       }

     

       56
       56
       +
       

     

       57
       57
       +
       func (i *Issue) CommentList() []CommentListItem {

     

       58
       58
       +
       	// Create a map to quickly find comments by their aturi

     

       59
       59
       +
       	toplevel := make(map[string]*CommentListItem)

     

       60
       60
       +
       	var replies []*IssueComment

     

       61
       61
       +
       

     

       62
       62
       +
       	// collect top level comments into the map

     

       63
       63
       +
       	for _, comment := range i.Comments {

     

       64
       64
       +
       		if comment.IsTopLevel() {

     

       65
       65
       +
       			toplevel[comment.AtUri().String()] = &CommentListItem{

     

       66
       66
       +
       				Self: &comment,

     

       67
       67
       +
       			}

     

       68
       68
       +
       		} else {

     

       69
       69
       +
       			replies = append(replies, &comment)

     

       70
       70
       +
       		}

     

       71
       71
       +
       	}

     

       72
       72
       +
       

     

       73
       73
       +
       	for _, r := range replies {

     

       74
       74
       +
       		parentAt := *r.ReplyTo

     

       75
       75
       +
       		if parent, exists := toplevel[parentAt]; exists {

     

       76
       76
       +
       			parent.Replies = append(parent.Replies, r)

     

       77
       77
       +
       		}

     

       78
       78
       +
       	}

     

       79
       79
       +
       

     

       80
       80
       +
       	var listing []CommentListItem

     

       81
       81
       +
       	for _, v := range toplevel {

     

       82
       82
       +
       		listing = append(listing, *v)

     

       83
       83
       +
       	}

     

       84
       84
       +
       

     

       85
       85
       +
       	// sort everything

     

       86
       86
       +
       	sortFunc := func(a, b *IssueComment) bool {

     

       87
       87
       +
       		return a.Created.Before(b.Created)

     

       88
       88
       +
       	}

     

       89
       89
       +
       	sort.Slice(listing, func(i, j int) bool {

     

       90
       90
       +
       		return sortFunc(listing[i].Self, listing[j].Self)

     

       91
       91
       +
       	})

     

       92
       92
       +
       	for _, r := range listing {

     

       93
       93
       +
       		sort.Slice(r.Replies, func(i, j int) bool {

     

       94
       94
       +
       			return sortFunc(r.Replies[i], r.Replies[j])

     

       95
       95
       +
       		})

     

       96
       96
       +
       	}

     

       97
       97
       +
       

     

       98
       98
       +
       	return listing

     

       99
       99
       +
       }

     

       100
       100
       +
       

     

       101
       101
       +
       func (i *Issue) Participants() []string {

     

       102
       102
       +
       	participantSet := make(map[string]struct{})

     

       103
       103
       +
       	participants := []string{}

     

       104
       104
       +
       

     

       105
       105
       +
       	addParticipant := func(did string) {

     

       106
       106
       +
       		if _, exists := participantSet[did]; !exists {

     

       107
       107
       +
       			participantSet[did] = struct{}{}

     

       108
       108
       +
       			participants = append(participants, did)

     

       109
       109
       +
       		}

     

       110
       110
       +
       	}

     

       111
       111
       +
       

     

       112
       112
       +
       	addParticipant(i.Did)

     

       113
       113
       +
       

     

       114
       114
       +
       	for _, c := range i.Comments {

     

       115
       115
       +
       		addParticipant(c.Did)

     

       116
       116
       +
       	}

     

       117
       117
       +
       

     

       118
       118
       +
       	return participants

     

       119
       119
       +
       }

     

       120
       120
       +
       

     

       121
       121
       +
       func IssueFromRecord(did, rkey string, record tangled.RepoIssue) Issue {

     

       122
       122
       +
       	created, err := time.Parse(time.RFC3339, record.CreatedAt)

     

       123
       123
       +
       	if err != nil {

     

       124
       124
       +
       		created = time.Now()

     

       125
       125
       +
       	}

     

       126
       126
       +
       

     

       127
       127
       +
       	body := ""

     

       128
       128
       +
       	if record.Body != nil {

     

       129
       129
       +
       		body = *record.Body

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	return Issue{

     

       133
       133
       +
       		RepoAt:  syntax.ATURI(record.Repo),

     

       134
       134
       +
       		Did:     did,

     

       135
       135
       +
       		Rkey:    rkey,

     

       136
       136
       +
       		Created: created,

     

       137
       137
       +
       		Title:   record.Title,

     

       138
       138
       +
       		Body:    body,

     

       139
       139
       +
       		Open:    true, // new issues are open by default

     

       140
       140
       +
       	}

     

       141
       141
       +
       }

     

       142
       142
       +
       

     

       143
       143
       +
       type IssueComment struct {

     

       144
       144
       +
       	Id      int64

     

       145
       145
       +
       	Did     string

     

       146
       146
       +
       	Rkey    string

     

       147
       147
       +
       	IssueAt string

     

       148
       148
       +
       	ReplyTo *string

     

       149
       149
       +
       	Body    string

     

       150
       150
       +
       	Created time.Time

     

       151
       151
       +
       	Edited  *time.Time

     

       152
       152
       +
       	Deleted *time.Time

     

       153
       153
       +
       }

     

       154
       154
       +
       

     

       155
       155
       +
       func (i *IssueComment) AtUri() syntax.ATURI {

     

       156
       156
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueCommentNSID, i.Rkey))

     

       157
       157
       +
       }

     

       158
       158
       +
       

     

       159
       159
       +
       func (i *IssueComment) AsRecord() tangled.RepoIssueComment {

     

       160
       160
       +
       	return tangled.RepoIssueComment{

     

       161
       161
       +
       		Body:      i.Body,

     

       162
       162
       +
       		Issue:     i.IssueAt,

     

       163
       163
       +
       		CreatedAt: i.Created.Format(time.RFC3339),

     

       164
       164
       +
       		ReplyTo:   i.ReplyTo,

     

       165
       165
       +
       	}

     

       166
       166
       +
       }

     

       167
       167
       +
       

     

       168
       168
       +
       func (i *IssueComment) IsTopLevel() bool {

     

       169
       169
       +
       	return i.ReplyTo == nil

     

       170
       170
       +
       }

     

       171
       171
       +
       

     

       172
       172
       +
       func IssueCommentFromRecord(did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) {

     

       173
       173
       +
       	created, err := time.Parse(time.RFC3339, record.CreatedAt)

     

       174
       174
       +
       	if err != nil {

     

       175
       175
       +
       		created = time.Now()

     

       176
       176
       +
       	}

     

       177
       177
       +
       

     

       178
       178
       +
       	ownerDid := did

     

       179
       179
       +
       

     

       180
       180
       +
       	if _, err = syntax.ParseATURI(record.Issue); err != nil {

     

       181
       181
       +
       		return nil, err

     

       182
       182
       +
       	}

     

       183
       183
       +
       

     

       184
       184
       +
       	comment := IssueComment{

     

       185
       185
       +
       		Did:     ownerDid,

     

       186
       186
       +
       		Rkey:    rkey,

     

       187
       187
       +
       		Body:    record.Body,

     

       188
       188
       +
       		IssueAt: record.Issue,

     

       189
       189
       +
       		ReplyTo: record.ReplyTo,

     

       190
       190
       +
       		Created: created,

     

       191
       191
       +
       	}

     

       192
       192
       +
       

     

       193
       193
       +
       	return &comment, nil

     

       194
       194
       +
       }

+3 -2

appview/validator/issue.go

···

       5
       5
        
       	"strings"

     

       6
       6
        
       

     

       7
       7
        
       	"tangled.org/core/appview/db"

     

       8
       8
       +
       	"tangled.org/core/appview/models"

     

       8
       9
        
       )

     

       9
       10
        
       

     

       10
       10
       -
       func (v *Validator) ValidateIssueComment(comment *db.IssueComment) error {

     

       11
       11
       +
       func (v *Validator) ValidateIssueComment(comment *models.IssueComment) error {

     

       11
       12
        
       	// if comments have parents, only ingest ones that are 1 level deep

     

       12
       13
        
       	if comment.ReplyTo != nil {

     

       13
       14
        
       		parents, err := db.GetIssueComments(v.db, db.FilterEq("at_uri", *comment.ReplyTo))

     
···

       32
       33
        
       	return nil

     

       33
       34
        
       }

     

       34
       35
        
       

     

       35
       35
       -
       func (v *Validator) ValidateIssue(issue *db.Issue) error {

     

       36
       36
       +
       func (v *Validator) ValidateIssue(issue *models.Issue) error {

     

       36
       37
        
       	if issue.Title == "" {

     

       37
       38
        
       		return fmt.Errorf("issue title is empty")

     

       38
       39
        
       	}

+14

appview/models/language.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       type RepoLanguage struct {

     

       8
       8
       +
       	Id           int64

     

       9
       9
       +
       	RepoAt       syntax.ATURI

     

       10
       10
       +
       	Ref          string

     

       11
       11
       +
       	IsDefaultRef bool

     

       12
       12
       +
       	Language     string

     

       13
       13
       +
       	Bytes        int64

     

       14
       14
       +
       }

-173

appview/db/oauth.go

···

       1
       1
       -
       package db

     

       2
       2
       -
       

     

       3
       3
       -
       type OAuthRequest struct {

     

       4
       4
       -
       	ID                  uint

     

       5
       5
       -
       	AuthserverIss       string

     

       6
       6
       -
       	Handle              string

     

       7
       7
       -
       	State               string

     

       8
       8
       -
       	Did                 string

     

       9
       9
       -
       	PdsUrl              string

     

       10
       10
       -
       	PkceVerifier        string

     

       11
       11
       -
       	DpopAuthserverNonce string

     

       12
       12
       -
       	DpopPrivateJwk      string

     

       13
       13
       -
       }

     

       14
       14
       -
       

     

       15
       15
       -
       func SaveOAuthRequest(e Execer, oauthRequest OAuthRequest) error {

     

       16
       16
       -
       	_, err := e.Exec(`

     

       17
       17
       -
       		insert into oauth_requests (

     

       18
       18
       -
       			auth_server_iss,

     

       19
       19
       -
       			state,

     

       20
       20
       -
       			handle,

     

       21
       21
       -
       			did,

     

       22
       22
       -
       			pds_url,

     

       23
       23
       -
       			pkce_verifier,

     

       24
       24
       -
       			dpop_auth_server_nonce,

     

       25
       25
       -
       			dpop_private_jwk

     

       26
       26
       -
       		) values (?, ?, ?, ?, ?, ?, ?, ?)`,

     

       27
       27
       -
       		oauthRequest.AuthserverIss,

     

       28
       28
       -
       		oauthRequest.State,

     

       29
       29
       -
       		oauthRequest.Handle,

     

       30
       30
       -
       		oauthRequest.Did,

     

       31
       31
       -
       		oauthRequest.PdsUrl,

     

       32
       32
       -
       		oauthRequest.PkceVerifier,

     

       33
       33
       -
       		oauthRequest.DpopAuthserverNonce,

     

       34
       34
       -
       		oauthRequest.DpopPrivateJwk,

     

       35
       35
       -
       	)

     

       36
       36
       -
       	return err

     

       37
       37
       -
       }

     

       38
       38
       -
       

     

       39
       39
       -
       func GetOAuthRequestByState(e Execer, state string) (OAuthRequest, error) {

     

       40
       40
       -
       	var req OAuthRequest

     

       41
       41
       -
       	err := e.QueryRow(`

     

       42
       42
       -
       		select

     

       43
       43
       -
       			id,

     

       44
       44
       -
       			auth_server_iss,

     

       45
       45
       -
       			handle,

     

       46
       46
       -
       			state,

     

       47
       47
       -
       			did,

     

       48
       48
       -
       			pds_url,

     

       49
       49
       -
       			pkce_verifier,

     

       50
       50
       -
       			dpop_auth_server_nonce,

     

       51
       51
       -
       			dpop_private_jwk

     

       52
       52
       -
       		from oauth_requests

     

       53
       53
       -
       		where state = ?`, state).Scan(

     

       54
       54
       -
       		&req.ID,

     

       55
       55
       -
       		&req.AuthserverIss,

     

       56
       56
       -
       		&req.Handle,

     

       57
       57
       -
       		&req.State,

     

       58
       58
       -
       		&req.Did,

     

       59
       59
       -
       		&req.PdsUrl,

     

       60
       60
       -
       		&req.PkceVerifier,

     

       61
       61
       -
       		&req.DpopAuthserverNonce,

     

       62
       62
       -
       		&req.DpopPrivateJwk,

     

       63
       63
       -
       	)

     

       64
       64
       -
       	return req, err

     

       65
       65
       -
       }

     

       66
       66
       -
       

     

       67
       67
       -
       func DeleteOAuthRequestByState(e Execer, state string) error {

     

       68
       68
       -
       	_, err := e.Exec(`

     

       69
       69
       -
       		delete from oauth_requests

     

       70
       70
       -
       		where state = ?`, state)

     

       71
       71
       -
       	return err

     

       72
       72
       -
       }

     

       73
       73
       -
       

     

       74
       74
       -
       type OAuthSession struct {

     

       75
       75
       -
       	ID                  uint

     

       76
       76
       -
       	Handle              string

     

       77
       77
       -
       	Did                 string

     

       78
       78
       -
       	PdsUrl              string

     

       79
       79
       -
       	AccessJwt           string

     

       80
       80
       -
       	RefreshJwt          string

     

       81
       81
       -
       	AuthServerIss       string

     

       82
       82
       -
       	DpopPdsNonce        string

     

       83
       83
       -
       	DpopAuthserverNonce string

     

       84
       84
       -
       	DpopPrivateJwk      string

     

       85
       85
       -
       	Expiry              string

     

       86
       86
       -
       }

     

       87
       87
       -
       

     

       88
       88
       -
       func SaveOAuthSession(e Execer, session OAuthSession) error {

     

       89
       89
       -
       	_, err := e.Exec(`

     

       90
       90
       -
         insert into oauth_sessions (

     

       91
       91
       -
          did,

     

       92
       92
       -
          handle,

     

       93
       93
       -
          pds_url,

     

       94
       94
       -
          access_jwt,

     

       95
       95
       -
          refresh_jwt,

     

       96
       96
       -
          auth_server_iss,

     

       97
       97
       -
          dpop_auth_server_nonce,

     

       98
       98
       -
          dpop_private_jwk,

     

       99
       99
       -
          expiry

     

       100
       100
       -
         ) values (?, ?, ?, ?, ?, ?, ?, ?, ?)`,

     

       101
       101
       -
       		session.Did,

     

       102
       102
       -
       		session.Handle,

     

       103
       103
       -
       		session.PdsUrl,

     

       104
       104
       -
       		session.AccessJwt,

     

       105
       105
       -
       		session.RefreshJwt,

     

       106
       106
       -
       		session.AuthServerIss,

     

       107
       107
       -
       		session.DpopAuthserverNonce,

     

       108
       108
       -
       		session.DpopPrivateJwk,

     

       109
       109
       -
       		session.Expiry,

     

       110
       110
       -
       	)

     

       111
       111
       -
       	return err

     

       112
       112
       -
       }

     

       113
       113
       -
       

     

       114
       114
       -
       func RefreshOAuthSession(e Execer, did string, accessJwt, refreshJwt, expiry string) error {

     

       115
       115
       -
       	_, err := e.Exec(`

     

       116
       116
       -
         update oauth_sessions

     

       117
       117
       -
         set access_jwt = ?, refresh_jwt = ?, expiry = ?

     

       118
       118
       -
         where did = ?`,

     

       119
       119
       -
       		accessJwt,

     

       120
       120
       -
       		refreshJwt,

     

       121
       121
       -
       		expiry,

     

       122
       122
       -
       		did,

     

       123
       123
       -
       	)

     

       124
       124
       -
       	return err

     

       125
       125
       -
       }

     

       126
       126
       -
       

     

       127
       127
       -
       func GetOAuthSessionByDid(e Execer, did string) (*OAuthSession, error) {

     

       128
       128
       -
       	var session OAuthSession

     

       129
       129
       -
       	err := e.QueryRow(`

     

       130
       130
       -
         select

     

       131
       131
       -
          id,

     

       132
       132
       -
          did,

     

       133
       133
       -
          handle,

     

       134
       134
       -
          pds_url,

     

       135
       135
       -
          access_jwt,

     

       136
       136
       -
          refresh_jwt,

     

       137
       137
       -
          auth_server_iss,

     

       138
       138
       -
          dpop_auth_server_nonce,

     

       139
       139
       -
          dpop_private_jwk,

     

       140
       140
       -
          expiry

     

       141
       141
       -
         from oauth_sessions

     

       142
       142
       -
         where did = ?`, did).Scan(

     

       143
       143
       -
       		&session.ID,

     

       144
       144
       -
       		&session.Did,

     

       145
       145
       -
       		&session.Handle,

     

       146
       146
       -
       		&session.PdsUrl,

     

       147
       147
       -
       		&session.AccessJwt,

     

       148
       148
       -
       		&session.RefreshJwt,

     

       149
       149
       -
       		&session.AuthServerIss,

     

       150
       150
       -
       		&session.DpopAuthserverNonce,

     

       151
       151
       -
       		&session.DpopPrivateJwk,

     

       152
       152
       -
       		&session.Expiry,

     

       153
       153
       -
       	)

     

       154
       154
       -
       	return &session, err

     

       155
       155
       -
       }

     

       156
       156
       -
       

     

       157
       157
       -
       func DeleteOAuthSessionByDid(e Execer, did string) error {

     

       158
       158
       -
       	_, err := e.Exec(`

     

       159
       159
       -
         delete from oauth_sessions

     

       160
       160
       -
         where did = ?`, did)

     

       161
       161
       -
       	return err

     

       162
       162
       -
       }

     

       163
       163
       -
       

     

       164
       164
       -
       func UpdateDpopPdsNonce(e Execer, did string, dpopPdsNonce string) error {

     

       165
       165
       -
       	_, err := e.Exec(`

     

       166
       166
       -
         update oauth_sessions

     

       167
       167
       -
         set dpop_pds_nonce = ?

     

       168
       168
       -
         where did = ?`,

     

       169
       169
       -
       		dpopPdsNonce,

     

       170
       170
       -
       		did,

     

       171
       171
       -
       	)

     

       172
       172
       -
       	return err

     

       173
       173
       -
       }

+177

appview/models/profile.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       	"tangled.org/core/api/tangled"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       type Profile struct {

     

       11
       11
       +
       	// ids

     

       12
       12
       +
       	ID  int

     

       13
       13
       +
       	Did string

     

       14
       14
       +
       

     

       15
       15
       +
       	// data

     

       16
       16
       +
       	Description    string

     

       17
       17
       +
       	IncludeBluesky bool

     

       18
       18
       +
       	Location       string

     

       19
       19
       +
       	Links          [5]string

     

       20
       20
       +
       	Stats          [2]VanityStat

     

       21
       21
       +
       	PinnedRepos    [6]syntax.ATURI

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       func (p Profile) IsLinksEmpty() bool {

     

       25
       25
       +
       	for _, l := range p.Links {

     

       26
       26
       +
       		if l != "" {

     

       27
       27
       +
       			return false

     

       28
       28
       +
       		}

     

       29
       29
       +
       	}

     

       30
       30
       +
       	return true

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       func (p Profile) IsStatsEmpty() bool {

     

       34
       34
       +
       	for _, s := range p.Stats {

     

       35
       35
       +
       		if s.Kind != "" {

     

       36
       36
       +
       			return false

     

       37
       37
       +
       		}

     

       38
       38
       +
       	}

     

       39
       39
       +
       	return true

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       func (p Profile) IsPinnedReposEmpty() bool {

     

       43
       43
       +
       	for _, r := range p.PinnedRepos {

     

       44
       44
       +
       		if r != "" {

     

       45
       45
       +
       			return false

     

       46
       46
       +
       		}

     

       47
       47
       +
       	}

     

       48
       48
       +
       	return true

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       type VanityStatKind string

     

       52
       52
       +
       

     

       53
       53
       +
       const (

     

       54
       54
       +
       	VanityStatMergedPRCount    VanityStatKind = "merged-pull-request-count"

     

       55
       55
       +
       	VanityStatClosedPRCount    VanityStatKind = "closed-pull-request-count"

     

       56
       56
       +
       	VanityStatOpenPRCount      VanityStatKind = "open-pull-request-count"

     

       57
       57
       +
       	VanityStatOpenIssueCount   VanityStatKind = "open-issue-count"

     

       58
       58
       +
       	VanityStatClosedIssueCount VanityStatKind = "closed-issue-count"

     

       59
       59
       +
       	VanityStatRepositoryCount  VanityStatKind = "repository-count"

     

       60
       60
       +
       )

     

       61
       61
       +
       

     

       62
       62
       +
       func (v VanityStatKind) String() string {

     

       63
       63
       +
       	switch v {

     

       64
       64
       +
       	case VanityStatMergedPRCount:

     

       65
       65
       +
       		return "Merged PRs"

     

       66
       66
       +
       	case VanityStatClosedPRCount:

     

       67
       67
       +
       		return "Closed PRs"

     

       68
       68
       +
       	case VanityStatOpenPRCount:

     

       69
       69
       +
       		return "Open PRs"

     

       70
       70
       +
       	case VanityStatOpenIssueCount:

     

       71
       71
       +
       		return "Open Issues"

     

       72
       72
       +
       	case VanityStatClosedIssueCount:

     

       73
       73
       +
       		return "Closed Issues"

     

       74
       74
       +
       	case VanityStatRepositoryCount:

     

       75
       75
       +
       		return "Repositories"

     

       76
       76
       +
       	}

     

       77
       77
       +
       	return ""

     

       78
       78
       +
       }

     

       79
       79
       +
       

     

       80
       80
       +
       type VanityStat struct {

     

       81
       81
       +
       	Kind  VanityStatKind

     

       82
       82
       +
       	Value uint64

     

       83
       83
       +
       }

     

       84
       84
       +
       

     

       85
       85
       +
       func (p *Profile) ProfileAt() syntax.ATURI {

     

       86
       86
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", p.Did, tangled.ActorProfileNSID, "self"))

     

       87
       87
       +
       }

     

       88
       88
       +
       

     

       89
       89
       +
       type RepoEvent struct {

     

       90
       90
       +
       	Repo   *Repo

     

       91
       91
       +
       	Source *Repo

     

       92
       92
       +
       }

     

       93
       93
       +
       

     

       94
       94
       +
       type ProfileTimeline struct {

     

       95
       95
       +
       	ByMonth []ByMonth

     

       96
       96
       +
       }

     

       97
       97
       +
       

     

       98
       98
       +
       func (p *ProfileTimeline) IsEmpty() bool {

     

       99
       99
       +
       	if p == nil {

     

       100
       100
       +
       		return true

     

       101
       101
       +
       	}

     

       102
       102
       +
       

     

       103
       103
       +
       	for _, m := range p.ByMonth {

     

       104
       104
       +
       		if !m.IsEmpty() {

     

       105
       105
       +
       			return false

     

       106
       106
       +
       		}

     

       107
       107
       +
       	}

     

       108
       108
       +
       

     

       109
       109
       +
       	return true

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       type ByMonth struct {

     

       113
       113
       +
       	RepoEvents  []RepoEvent

     

       114
       114
       +
       	IssueEvents IssueEvents

     

       115
       115
       +
       	PullEvents  PullEvents

     

       116
       116
       +
       }

     

       117
       117
       +
       

     

       118
       118
       +
       func (b ByMonth) IsEmpty() bool {

     

       119
       119
       +
       	return len(b.RepoEvents) == 0 &&

     

       120
       120
       +
       		len(b.IssueEvents.Items) == 0 &&

     

       121
       121
       +
       		len(b.PullEvents.Items) == 0

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       type IssueEvents struct {

     

       125
       125
       +
       	Items []*Issue

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       type IssueEventStats struct {

     

       129
       129
       +
       	Open   int

     

       130
       130
       +
       	Closed int

     

       131
       131
       +
       }

     

       132
       132
       +
       

     

       133
       133
       +
       func (i IssueEvents) Stats() IssueEventStats {

     

       134
       134
       +
       	var open, closed int

     

       135
       135
       +
       	for _, issue := range i.Items {

     

       136
       136
       +
       		if issue.Open {

     

       137
       137
       +
       			open += 1

     

       138
       138
       +
       		} else {

     

       139
       139
       +
       			closed += 1

     

       140
       140
       +
       		}

     

       141
       141
       +
       	}

     

       142
       142
       +
       

     

       143
       143
       +
       	return IssueEventStats{

     

       144
       144
       +
       		Open:   open,

     

       145
       145
       +
       		Closed: closed,

     

       146
       146
       +
       	}

     

       147
       147
       +
       }

     

       148
       148
       +
       

     

       149
       149
       +
       type PullEvents struct {

     

       150
       150
       +
       	Items []*Pull

     

       151
       151
       +
       }

     

       152
       152
       +
       

     

       153
       153
       +
       func (p PullEvents) Stats() PullEventStats {

     

       154
       154
       +
       	var open, merged, closed int

     

       155
       155
       +
       	for _, pull := range p.Items {

     

       156
       156
       +
       		switch pull.State {

     

       157
       157
       +
       		case PullOpen:

     

       158
       158
       +
       			open += 1

     

       159
       159
       +
       		case PullMerged:

     

       160
       160
       +
       			merged += 1

     

       161
       161
       +
       		case PullClosed:

     

       162
       162
       +
       			closed += 1

     

       163
       163
       +
       		}

     

       164
       164
       +
       	}

     

       165
       165
       +
       

     

       166
       166
       +
       	return PullEventStats{

     

       167
       167
       +
       		Open:   open,

     

       168
       168
       +
       		Merged: merged,

     

       169
       169
       +
       		Closed: closed,

     

       170
       170
       +
       	}

     

       171
       171
       +
       }

     

       172
       172
       +
       

     

       173
       173
       +
       type PullEventStats struct {

     

       174
       174
       +
       	Closed int

     

       175
       175
       +
       	Open   int

     

       176
       176
       +
       	Merged int

     

       177
       177
       +
       }

+17 -139

appview/db/pipeline.go

···

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
        
       

     

       9
       9
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       10
       10
       -
       	"github.com/go-git/go-git/v5/plumbing"

     

       11
       11
       -
       	spindle "tangled.org/core/spindle/models"

     

       12
       12
       -
       	"tangled.org/core/workflow"

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       13
       10
        
       )

     

       14
       11
        
       

     

       15
       15
       -
       type Pipeline struct {

     

       16
       16
       -
       	Id        int

     

       17
       17
       -
       	Rkey      string

     

       18
       18
       -
       	Knot      string

     

       19
       19
       -
       	RepoOwner syntax.DID

     

       20
       20
       -
       	RepoName  string

     

       21
       21
       -
       	TriggerId int

     

       22
       22
       -
       	Sha       string

     

       23
       23
       -
       	Created   time.Time

     

       24
       24
       -
       

     

       25
       25
       -
       	// populate when querying for reverse mappings

     

       26
       26
       -
       	Trigger  *Trigger

     

       27
       27
       -
       	Statuses map[string]WorkflowStatus

     

       28
       28
       -
       }

     

       29
       29
       -
       

     

       30
       30
       -
       type WorkflowStatus struct {

     

       31
       31
       -
       	Data []PipelineStatus

     

       32
       32
       -
       }

     

       33
       33
       -
       

     

       34
       34
       -
       func (w WorkflowStatus) Latest() PipelineStatus {

     

       35
       35
       -
       	return w.Data[len(w.Data)-1]

     

       36
       36
       -
       }

     

       37
       37
       -
       

     

       38
       38
       -
       // time taken by this workflow to reach an "end state"

     

       39
       39
       -
       func (w WorkflowStatus) TimeTaken() time.Duration {

     

       40
       40
       -
       	var start, end *time.Time

     

       41
       41
       -
       	for _, s := range w.Data {

     

       42
       42
       -
       		if s.Status.IsStart() {

     

       43
       43
       -
       			start = &s.Created

     

       44
       44
       -
       		}

     

       45
       45
       -
       		if s.Status.IsFinish() {

     

       46
       46
       -
       			end = &s.Created

     

       47
       47
       -
       		}

     

       48
       48
       -
       	}

     

       49
       49
       -
       

     

       50
       50
       -
       	if start != nil && end != nil && end.After(*start) {

     

       51
       51
       -
       		return end.Sub(*start)

     

       52
       52
       -
       	}

     

       53
       53
       -
       

     

       54
       54
       -
       	return 0

     

       55
       55
       -
       }

     

       56
       56
       -
       

     

       57
       57
       -
       func (p Pipeline) Counts() map[string]int {

     

       58
       58
       -
       	m := make(map[string]int)

     

       59
       59
       -
       	for _, w := range p.Statuses {

     

       60
       60
       -
       		m[w.Latest().Status.String()] += 1

     

       61
       61
       -
       	}

     

       62
       62
       -
       	return m

     

       63
       63
       -
       }

     

       64
       64
       -
       

     

       65
       65
       -
       func (p Pipeline) TimeTaken() time.Duration {

     

       66
       66
       -
       	var s time.Duration

     

       67
       67
       -
       	for _, w := range p.Statuses {

     

       68
       68
       -
       		s += w.TimeTaken()

     

       69
       69
       -
       	}

     

       70
       70
       -
       	return s

     

       71
       71
       -
       }

     

       72
       72
       -
       

     

       73
       73
       -
       func (p Pipeline) Workflows() []string {

     

       74
       74
       -
       	var ws []string

     

       75
       75
       -
       	for v := range p.Statuses {

     

       76
       76
       -
       		ws = append(ws, v)

     

       77
       77
       -
       	}

     

       78
       78
       -
       	slices.Sort(ws)

     

       79
       79
       -
       	return ws

     

       80
       80
       -
       }

     

       81
       81
       -
       

     

       82
       82
       -
       // if we know that a spindle has picked up this pipeline, then it is Responding

     

       83
       83
       -
       func (p Pipeline) IsResponding() bool {

     

       84
       84
       -
       	return len(p.Statuses) != 0

     

       85
       85
       -
       }

     

       86
       86
       -
       

     

       87
       87
       -
       type Trigger struct {

     

       88
       88
       -
       	Id   int

     

       89
       89
       -
       	Kind workflow.TriggerKind

     

       90
       90
       -
       

     

       91
       91
       -
       	// push trigger fields

     

       92
       92
       -
       	PushRef    *string

     

       93
       93
       -
       	PushNewSha *string

     

       94
       94
       -
       	PushOldSha *string

     

       95
       95
       -
       

     

       96
       96
       -
       	// pull request trigger fields

     

       97
       97
       -
       	PRSourceBranch *string

     

       98
       98
       -
       	PRTargetBranch *string

     

       99
       99
       -
       	PRSourceSha    *string

     

       100
       100
       -
       	PRAction       *string

     

       101
       101
       -
       }

     

       102
       102
       -
       

     

       103
       103
       -
       func (t *Trigger) IsPush() bool {

     

       104
       104
       -
       	return t != nil && t.Kind == workflow.TriggerKindPush

     

       105
       105
       -
       }

     

       106
       106
       -
       

     

       107
       107
       -
       func (t *Trigger) IsPullRequest() bool {

     

       108
       108
       -
       	return t != nil && t.Kind == workflow.TriggerKindPullRequest

     

       109
       109
       -
       }

     

       110
       110
       -
       

     

       111
       111
       -
       func (t *Trigger) TargetRef() string {

     

       112
       112
       -
       	if t.IsPush() {

     

       113
       113
       -
       		return plumbing.ReferenceName(*t.PushRef).Short()

     

       114
       114
       -
       	} else if t.IsPullRequest() {

     

       115
       115
       -
       		return *t.PRTargetBranch

     

       116
       116
       -
       	}

     

       117
       117
       -
       

     

       118
       118
       -
       	return ""

     

       119
       119
       -
       }

     

       120
       120
       -
       

     

       121
       121
       -
       type PipelineStatus struct {

     

       122
       122
       -
       	ID           int

     

       123
       123
       -
       	Spindle      string

     

       124
       124
       -
       	Rkey         string

     

       125
       125
       -
       	PipelineKnot string

     

       126
       126
       -
       	PipelineRkey string

     

       127
       127
       -
       	Created      time.Time

     

       128
       128
       -
       	Workflow     string

     

       129
       129
       -
       	Status       spindle.StatusKind

     

       130
       130
       -
       	Error        *string

     

       131
       131
       -
       	ExitCode     int

     

       132
       132
       -
       }

     

       133
       133
       -
       

     

       134
       134
       -
       func GetPipelines(e Execer, filters ...filter) ([]Pipeline, error) {

     

       135
       135
       -
       	var pipelines []Pipeline

     

       12
       12
       +
       func GetPipelines(e Execer, filters ...filter) ([]models.Pipeline, error) {

     

       13
       13
       +
       	var pipelines []models.Pipeline

     

       136
       14
        
       

     

       137
       15
        
       	var conditions []string

     

       138
       16
        
       	var args []any

     
···

       156
       34
        
       	defer rows.Close()

     

       157
       35
        
       

     

       158
       36
        
       	for rows.Next() {

     

       159
       159
       -
       		var pipeline Pipeline

     

       37
       37
       +
       		var pipeline models.Pipeline

     

       160
       38
        
       		var createdAt string

     

       161
       39
        
       		err = rows.Scan(

     

       162
       40
        
       			&pipeline.Id,

     
···

       185
       63
        
       	return pipelines, nil

     

       186
       64
        
       }

     

       187
       65
        
       

     

       188
       188
       -
       func AddPipeline(e Execer, pipeline Pipeline) error {

     

       66
       66
       +
       func AddPipeline(e Execer, pipeline models.Pipeline) error {

     

       189
       67
        
       	args := []any{

     

       190
       68
        
       		pipeline.Rkey,

     

       191
       69
        
       		pipeline.Knot,

     
···

       216
       94
        
       	return err

     

       217
       95
        
       }

     

       218
       96
        
       

     

       219
       219
       -
       func AddTrigger(e Execer, trigger Trigger) (int64, error) {

     

       97
       97
       +
       func AddTrigger(e Execer, trigger models.Trigger) (int64, error) {

     

       220
       98
        
       	args := []any{

     

       221
       99
        
       		trigger.Kind,

     

       222
       100
        
       		trigger.PushRef,

     
···

       252
       130
        
       	return res.LastInsertId()

     

       253
       131
        
       }

     

       254
       132
        
       

     

       255
       255
       -
       func AddPipelineStatus(e Execer, status PipelineStatus) error {

     

       133
       133
       +
       func AddPipelineStatus(e Execer, status models.PipelineStatus) error {

     

       256
       134
        
       	args := []any{

     

       257
       135
        
       		status.Spindle,

     

       258
       136
        
       		status.Rkey,

     
···

       290
       168
        
       

     

       291
       169
        
       // this is a mega query, but the most useful one:

     

       292
       170
        
       // get N pipelines, for each one get the latest status of its N workflows

     

       293
       293
       -
       func GetPipelineStatuses(e Execer, filters ...filter) ([]Pipeline, error) {

     

       171
       171
       +
       func GetPipelineStatuses(e Execer, filters ...filter) ([]models.Pipeline, error) {

     

       294
       172
        
       	var conditions []string

     

       295
       173
        
       	var args []any

     

       296
       174
        
       	for _, filter := range filters {

     
···

       335
       213
        
       	}

     

       336
       214
        
       	defer rows.Close()

     

       337
       215
        
       

     

       338
       338
       -
       	pipelines := make(map[string]Pipeline)

     

       216
       216
       +
       	pipelines := make(map[string]models.Pipeline)

     

       339
       217
        
       	for rows.Next() {

     

       340
       340
       -
       		var p Pipeline

     

       341
       341
       -
       		var t Trigger

     

       218
       218
       +
       		var p models.Pipeline

     

       219
       219
       +
       		var t models.Trigger

     

       342
       220
        
       		var created string

     

       343
       221
        
       

     

       344
       222
        
       		err := rows.Scan(

     
···

       370
       248
        
       

     

       371
       249
        
       		t.Id = p.TriggerId

     

       372
       250
        
       		p.Trigger = &t

     

       373
       373
       -
       		p.Statuses = make(map[string]WorkflowStatus)

     

       251
       251
       +
       		p.Statuses = make(map[string]models.WorkflowStatus)

     

       374
       252
        
       

     

       375
       253
        
       		k := fmt.Sprintf("%s/%s", p.Knot, p.Rkey)

     

       376
       254
        
       		pipelines[k] = p

     
···

       409
       287
        
       	defer rows.Close()

     

       410
       288
        
       

     

       411
       289
        
       	for rows.Next() {

     

       412
       412
       -
       		var ps PipelineStatus

     

       290
       290
       +
       		var ps models.PipelineStatus

     

       413
       291
        
       		var created string

     

       414
       292
        
       

     

       415
       293
        
       		err := rows.Scan(

     
···

       442
       320
        
       		}

     

       443
       321
        
       		statuses, _ := pipeline.Statuses[ps.Workflow]

     

       444
       322
        
       		if !ok {

     

       445
       445
       -
       			pipeline.Statuses[ps.Workflow] = WorkflowStatus{}

     

       323
       323
       +
       			pipeline.Statuses[ps.Workflow] = models.WorkflowStatus{}

     

       446
       324
        
       		}

     

       447
       325
        
       

     

       448
       326
        
       		// append

     
···

       453
       331
        
       		pipelines[key] = pipeline

     

       454
       332
        
       	}

     

       455
       333
        
       

     

       456
       456
       -
       	var all []Pipeline

     

       334
       334
       +
       	var all []models.Pipeline

     

       457
       335
        
       	for _, p := range pipelines {

     

       458
       336
        
       		for _, s := range p.Statuses {

     

       459
       459
       -
       			slices.SortFunc(s.Data, func(a, b PipelineStatus) int {

     

       337
       337
       +
       			slices.SortFunc(s.Data, func(a, b models.PipelineStatus) int {

     

       460
       338
        
       				if a.Created.After(b.Created) {

     

       461
       339
        
       					return 1

     

       462
       340
        
       				}

     
···

       476
       354
        
       	}

     

       477
       355
        
       

     

       478
       356
        
       	// sort pipelines by date

     

       479
       479
       -
       	slices.SortFunc(all, func(a, b Pipeline) int {

     

       357
       357
       +
       	slices.SortFunc(all, func(a, b models.Pipeline) int {

     

       480
       358
        
       		if a.Created.After(b.Created) {

     

       481
       359
        
       			return -1

     

       482
       360
        
       		}

+130

appview/models/pipeline.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"slices"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       9
       9
       +
       	spindle "tangled.org/core/spindle/models"

     

       10
       10
       +
       	"tangled.org/core/workflow"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       type Pipeline struct {

     

       14
       14
       +
       	Id        int

     

       15
       15
       +
       	Rkey      string

     

       16
       16
       +
       	Knot      string

     

       17
       17
       +
       	RepoOwner syntax.DID

     

       18
       18
       +
       	RepoName  string

     

       19
       19
       +
       	TriggerId int

     

       20
       20
       +
       	Sha       string

     

       21
       21
       +
       	Created   time.Time

     

       22
       22
       +
       

     

       23
       23
       +
       	// populate when querying for reverse mappings

     

       24
       24
       +
       	Trigger  *Trigger

     

       25
       25
       +
       	Statuses map[string]WorkflowStatus

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       type WorkflowStatus struct {

     

       29
       29
       +
       	Data []PipelineStatus

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       func (w WorkflowStatus) Latest() PipelineStatus {

     

       33
       33
       +
       	return w.Data[len(w.Data)-1]

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       // time taken by this workflow to reach an "end state"

     

       37
       37
       +
       func (w WorkflowStatus) TimeTaken() time.Duration {

     

       38
       38
       +
       	var start, end *time.Time

     

       39
       39
       +
       	for _, s := range w.Data {

     

       40
       40
       +
       		if s.Status.IsStart() {

     

       41
       41
       +
       			start = &s.Created

     

       42
       42
       +
       		}

     

       43
       43
       +
       		if s.Status.IsFinish() {

     

       44
       44
       +
       			end = &s.Created

     

       45
       45
       +
       		}

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	if start != nil && end != nil && end.After(*start) {

     

       49
       49
       +
       		return end.Sub(*start)

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	return 0

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       func (p Pipeline) Counts() map[string]int {

     

       56
       56
       +
       	m := make(map[string]int)

     

       57
       57
       +
       	for _, w := range p.Statuses {

     

       58
       58
       +
       		m[w.Latest().Status.String()] += 1

     

       59
       59
       +
       	}

     

       60
       60
       +
       	return m

     

       61
       61
       +
       }

     

       62
       62
       +
       

     

       63
       63
       +
       func (p Pipeline) TimeTaken() time.Duration {

     

       64
       64
       +
       	var s time.Duration

     

       65
       65
       +
       	for _, w := range p.Statuses {

     

       66
       66
       +
       		s += w.TimeTaken()

     

       67
       67
       +
       	}

     

       68
       68
       +
       	return s

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       71
       71
       +
       func (p Pipeline) Workflows() []string {

     

       72
       72
       +
       	var ws []string

     

       73
       73
       +
       	for v := range p.Statuses {

     

       74
       74
       +
       		ws = append(ws, v)

     

       75
       75
       +
       	}

     

       76
       76
       +
       	slices.Sort(ws)

     

       77
       77
       +
       	return ws

     

       78
       78
       +
       }

     

       79
       79
       +
       

     

       80
       80
       +
       // if we know that a spindle has picked up this pipeline, then it is Responding

     

       81
       81
       +
       func (p Pipeline) IsResponding() bool {

     

       82
       82
       +
       	return len(p.Statuses) != 0

     

       83
       83
       +
       }

     

       84
       84
       +
       

     

       85
       85
       +
       type Trigger struct {

     

       86
       86
       +
       	Id   int

     

       87
       87
       +
       	Kind workflow.TriggerKind

     

       88
       88
       +
       

     

       89
       89
       +
       	// push trigger fields

     

       90
       90
       +
       	PushRef    *string

     

       91
       91
       +
       	PushNewSha *string

     

       92
       92
       +
       	PushOldSha *string

     

       93
       93
       +
       

     

       94
       94
       +
       	// pull request trigger fields

     

       95
       95
       +
       	PRSourceBranch *string

     

       96
       96
       +
       	PRTargetBranch *string

     

       97
       97
       +
       	PRSourceSha    *string

     

       98
       98
       +
       	PRAction       *string

     

       99
       99
       +
       }

     

       100
       100
       +
       

     

       101
       101
       +
       func (t *Trigger) IsPush() bool {

     

       102
       102
       +
       	return t != nil && t.Kind == workflow.TriggerKindPush

     

       103
       103
       +
       }

     

       104
       104
       +
       

     

       105
       105
       +
       func (t *Trigger) IsPullRequest() bool {

     

       106
       106
       +
       	return t != nil && t.Kind == workflow.TriggerKindPullRequest

     

       107
       107
       +
       }

     

       108
       108
       +
       

     

       109
       109
       +
       func (t *Trigger) TargetRef() string {

     

       110
       110
       +
       	if t.IsPush() {

     

       111
       111
       +
       		return plumbing.ReferenceName(*t.PushRef).Short()

     

       112
       112
       +
       	} else if t.IsPullRequest() {

     

       113
       113
       +
       		return *t.PRTargetBranch

     

       114
       114
       +
       	}

     

       115
       115
       +
       

     

       116
       116
       +
       	return ""

     

       117
       117
       +
       }

     

       118
       118
       +
       

     

       119
       119
       +
       type PipelineStatus struct {

     

       120
       120
       +
       	ID           int

     

       121
       121
       +
       	Spindle      string

     

       122
       122
       +
       	Rkey         string

     

       123
       123
       +
       	PipelineKnot string

     

       124
       124
       +
       	PipelineRkey string

     

       125
       125
       +
       	Created      time.Time

     

       126
       126
       +
       	Workflow     string

     

       127
       127
       +
       	Status       spindle.StatusKind

     

       128
       128
       +
       	Error        *string

     

       129
       129
       +
       	ExitCode     int

     

       130
       130
       +
       }

+3 -2

appview/repo/repo_util.go

···

       10
       10
        
       	"strings"

     

       11
       11
        
       

     

       12
       12
        
       	"tangled.org/core/appview/db"

     

       13
       13
       +
       	"tangled.org/core/appview/models"

     

       13
       14
        
       	"tangled.org/core/appview/pages/repoinfo"

     

       14
       15
        
       	"tangled.org/core/types"

     

       15
       16
        
       

     
···

       143
       144
        
       	d *db.DB,

     

       144
       145
        
       	repoInfo repoinfo.RepoInfo,

     

       145
       146
        
       	shas []string,

     

       146
       146
       -
       ) (map[string]db.Pipeline, error) {

     

       147
       147
       -
       	m := make(map[string]db.Pipeline)

     

       147
       147
       +
       ) (map[string]models.Pipeline, error) {

     

       148
       148
       +
       	m := make(map[string]models.Pipeline)

     

       148
       149
        
       

     

       149
       150
        
       	if len(shas) == 0 {

     

       150
       151
        
       		return m, nil

+2 -1

appview/state/spindlestream.go

···

       13
       13
        
       	"tangled.org/core/appview/cache"

     

       14
       14
        
       	"tangled.org/core/appview/config"

     

       15
       15
        
       	"tangled.org/core/appview/db"

     

       16
       16
       +
       	"tangled.org/core/appview/models"

     

       16
       17
        
       	ec "tangled.org/core/eventconsumer"

     

       17
       18
        
       	"tangled.org/core/eventconsumer/cursor"

     

       18
       19
        
       	"tangled.org/core/log"

     
···

       89
       90
        
       		created = t

     

       90
       91
        
       	}

     

       91
       92
        
       

     

       92
       92
       -
       	status := db.PipelineStatus{

     

       93
       93
       +
       	status := models.PipelineStatus{

     

       93
       94
        
       		Spindle:      source.Key(),

     

       94
       95
        
       		Rkey:         msg.Rkey,

     

       95
       96
        
       		PipelineKnot: strings.TrimPrefix(pipelineUri.Authority().String(), "did:web:"),

+2 -1

appview/commitverify/verify.go

···

       5
       5
        
       

     

       6
       6
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       7
       7
        
       	"tangled.org/core/appview/db"

     

       8
       8
       +
       	"tangled.org/core/appview/models"

     

       8
       9
        
       	"tangled.org/core/crypto"

     

       9
       10
        
       	"tangled.org/core/types"

     

       10
       11
        
       )

     
···

       45
       46
        
       func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) {

     

       46
       47
        
       	vcs := VerifiedCommits{}

     

       47
       48
        
       

     

       48
       48
       -
       	didPubkeyCache := make(map[string][]db.PublicKey)

     

       49
       49
       +
       	didPubkeyCache := make(map[string][]models.PublicKey)

     

       49
       50
        
       

     

       50
       51
        
       	for _, commit := range ndCommits {

     

       51
       52
        
       		c := commit.Commit

+7 -26

appview/db/pubkeys.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       4
       4
       +
       	"tangled.org/core/appview/models"

     

       5
       5
        
       	"time"

     

       6
       6
        
       )

     

       7
       7
        
       

     
···

       29
       29
        
       	return err

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       type PublicKey struct {

     

       33
       33
       -
       	Did     string `json:"did"`

     

       34
       34
       -
       	Key     string `json:"key"`

     

       35
       35
       -
       	Name    string `json:"name"`

     

       36
       36
       -
       	Rkey    string `json:"rkey"`

     

       37
       37
       -
       	Created *time.Time

     

       38
       38
       -
       }

     

       39
       39
       -
       

     

       40
       40
       -
       func (p PublicKey) MarshalJSON() ([]byte, error) {

     

       41
       41
       -
       	type Alias PublicKey

     

       42
       42
       -
       	return json.Marshal(&struct {

     

       43
       43
       -
       		Created string `json:"created"`

     

       44
       44
       -
       		*Alias

     

       45
       45
       -
       	}{

     

       46
       46
       -
       		Created: p.Created.Format(time.RFC3339),

     

       47
       47
       -
       		Alias:   (*Alias)(&p),

     

       48
       48
       -
       	})

     

       49
       49
       -
       }

     

       50
       50
       -
       

     

       51
       51
       -
       func GetAllPublicKeys(e Execer) ([]PublicKey, error) {

     

       52
       52
       -
       	var keys []PublicKey

     

       32
       32
       +
       func GetAllPublicKeys(e Execer) ([]models.PublicKey, error) {

     

       33
       33
       +
       	var keys []models.PublicKey

     

       53
       34
        
       

     

       54
       35
        
       	rows, err := e.Query(`select key, name, did, rkey, created from public_keys`)

     

       55
       36
        
       	if err != nil {

     
···

       58
       39
        
       	defer rows.Close()

     

       59
       40
        
       

     

       60
       41
        
       	for rows.Next() {

     

       61
       61
       -
       		var publicKey PublicKey

     

       42
       42
       +
       		var publicKey models.PublicKey

     

       62
       43
        
       		var createdAt string

     

       63
       44
        
       		if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Rkey, &createdAt); err != nil {

     

       64
       45
        
       			return nil, err

     
···

       75
       56
        
       	return keys, nil

     

       76
       57
        
       }

     

       77
       58
        
       

     

       78
       78
       -
       func GetPublicKeysForDid(e Execer, did string) ([]PublicKey, error) {

     

       79
       79
       -
       	var keys []PublicKey

     

       59
       59
       +
       func GetPublicKeysForDid(e Execer, did string) ([]models.PublicKey, error) {

     

       60
       60
       +
       	var keys []models.PublicKey

     

       80
       61
        
       

     

       81
       62
        
       	rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did)

     

       82
       63
        
       	if err != nil {

     
···

       85
       66
        
       	defer rows.Close()

     

       86
       67
        
       

     

       87
       68
        
       	for rows.Next() {

     

       88
       88
       -
       		var publicKey PublicKey

     

       69
       69
       +
       		var publicKey models.PublicKey

     

       89
       70
        
       		var createdAt string

     

       90
       71
        
       		if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Rkey, &createdAt); err != nil {

     

       91
       72
        
       			return nil, err

+25

appview/models/pubkey.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       type PublicKey struct {

     

       9
       9
       +
       	Did     string `json:"did"`

     

       10
       10
       +
       	Key     string `json:"key"`

     

       11
       11
       +
       	Name    string `json:"name"`

     

       12
       12
       +
       	Rkey    string `json:"rkey"`

     

       13
       13
       +
       	Created *time.Time

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       func (p PublicKey) MarshalJSON() ([]byte, error) {

     

       17
       17
       +
       	type Alias PublicKey

     

       18
       18
       +
       	return json.Marshal(&struct {

     

       19
       19
       +
       		Created string `json:"created"`

     

       20
       20
       +
       		*Alias

     

       21
       21
       +
       	}{

     

       22
       22
       +
       		Created: p.Created.Format(time.RFC3339),

     

       23
       23
       +
       		Alias:   (*Alias)(&p),

     

       24
       24
       +
       	})

     

       25
       25
       +
       }

+7 -16

appview/db/punchcard.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
       -
       )

     

       9
       8
        
       

     

       10
       10
       -
       type Punch struct {

     

       11
       11
       -
       	Did   string

     

       12
       12
       -
       	Date  time.Time

     

       13
       13
       -
       	Count int

     

       14
       14
       -
       }

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       10
       10
       +
       )

     

       15
       11
        
       

     

       16
       12
        
       // this adds to the existing count

     

       17
       17
       -
       func AddPunch(e Execer, punch Punch) error {

     

       13
       13
       +
       func AddPunch(e Execer, punch models.Punch) error {

     

       18
       14
        
       	_, err := e.Exec(`

     

       19
       15
        
       		insert into punchcard (did, date, count)

     

       20
       16
        
       		values (?, ?, ?)

     
···

       24
       20
        
       	return err

     

       25
       21
        
       }

     

       26
       22
        
       

     

       27
       27
       -
       type Punchcard struct {

     

       28
       28
       -
       	Total   int

     

       29
       29
       -
       	Punches []Punch

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       func MakePunchcard(e Execer, filters ...filter) (*Punchcard, error) {

     

       33
       33
       -
       	punchcard := &Punchcard{}

     

       23
       23
       +
       func MakePunchcard(e Execer, filters ...filter) (*models.Punchcard, error) {

     

       24
       24
       +
       	punchcard := &models.Punchcard{}

     

       34
       25
        
       	now := time.Now()

     

       35
       26
        
       	startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

     

       36
       27
        
       	endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)

     

       37
       28
        
       	for d := startOfYear; d.Before(endOfYear) || d.Equal(endOfYear); d = d.AddDate(0, 0, 1) {

     

       38
       38
       -
       		punchcard.Punches = append(punchcard.Punches, Punch{

     

       29
       29
       +
       		punchcard.Punches = append(punchcard.Punches, models.Punch{

     

       39
       30
        
       			Date:  d,

     

       40
       31
        
       			Count: 0,

     

       41
       32
        
       		})

     
···

       68
       59
        
       	defer rows.Close()

     

       69
       60
        
       

     

       70
       61
        
       	for rows.Next() {

     

       71
       71
       -
       		var punch Punch

     

       62
       62
       +
       		var punch models.Punch

     

       72
       63
        
       		var date string

     

       73
       64
        
       		var count sql.NullInt64

     

       74
       65
        
       		if err := rows.Scan(&date, &count); err != nil {

+14

appview/models/punchcard.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       type Punch struct {

     

       6
       6
       +
       	Did   string

     

       7
       7
       +
       	Date  time.Time

     

       8
       8
       +
       	Count int

     

       9
       9
       +
       }

     

       10
       10
       +
       

     

       11
       11
       +
       type Punchcard struct {

     

       12
       12
       +
       	Total   int

     

       13
       13
       +
       	Punches []Punch

     

       14
       14
       +
       }

+4 -43

appview/db/registration.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       // Registration represents a knot registration. Knot would've been a better

     

       11
       11
       -
       // name but we're stuck with this for historical reasons.

     

       12
       12
       -
       type Registration struct {

     

       13
       13
       -
       	Id           int64

     

       14
       14
       -
       	Domain       string

     

       15
       15
       -
       	ByDid        string

     

       16
       16
       -
       	Created      *time.Time

     

       17
       17
       -
       	Registered   *time.Time

     

       18
       18
       -
       	NeedsUpgrade bool

     

       19
       19
       -
       }

     

       20
       20
       -
       

     

       21
       21
       -
       func (r *Registration) Status() Status {

     

       22
       22
       -
       	if r.NeedsUpgrade {

     

       23
       23
       -
       		return NeedsUpgrade

     

       24
       24
       -
       	} else if r.Registered != nil {

     

       25
       25
       -
       		return Registered

     

       26
       26
       -
       	} else {

     

       27
       27
       -
       		return Pending

     

       28
       28
       -
       	}

     

       29
       29
       -
       }

     

       30
       30
       -
       

     

       31
       31
       -
       func (r *Registration) IsRegistered() bool {

     

       32
       32
       -
       	return r.Status() == Registered

     

       33
       33
       -
       }

     

       34
       34
       -
       

     

       35
       35
       -
       func (r *Registration) IsNeedsUpgrade() bool {

     

       36
       36
       -
       	return r.Status() == NeedsUpgrade

     

       37
       37
       -
       }

     

       38
       38
       -
       

     

       39
       39
       -
       func (r *Registration) IsPending() bool {

     

       40
       40
       -
       	return r.Status() == Pending

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

       43
       43
       -
       type Status uint32

     

       44
       8
        
       

     

       45
       45
       -
       const (

     

       46
       46
       -
       	Registered Status = iota

     

       47
       47
       -
       	Pending

     

       48
       48
       -
       	NeedsUpgrade

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       49
       10
        
       )

     

       50
       11
        
       

     

       51
       51
       -
       func GetRegistrations(e Execer, filters ...filter) ([]Registration, error) {

     

       52
       52
       -
       	var registrations []Registration

     

       12
       12
       +
       func GetRegistrations(e Execer, filters ...filter) ([]models.Registration, error) {

     

       13
       13
       +
       	var registrations []models.Registration

     

       53
       14
        
       

     

       54
       15
        
       	var conditions []string

     

       55
       16
        
       	var args []any

     
···

       81
       42
        
       		var createdAt string

     

       82
       43
        
       		var registeredAt sql.Null[string]

     

       83
       44
        
       		var needsUpgrade int

     

       84
       84
       -
       		var reg Registration

     

       45
       45
       +
       		var reg models.Registration

     

       85
       46
        
       

     

       86
       47
        
       		err = rows.Scan(&reg.Id, &reg.Domain, &reg.ByDid, &createdAt, &registeredAt, &needsUpgrade)

     

       87
       48
        
       		if err != nil {

+44

appview/models/registration.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       // Registration represents a knot registration. Knot would've been a better

     

       6
       6
       +
       // name but we're stuck with this for historical reasons.

     

       7
       7
       +
       type Registration struct {

     

       8
       8
       +
       	Id           int64

     

       9
       9
       +
       	Domain       string

     

       10
       10
       +
       	ByDid        string

     

       11
       11
       +
       	Created      *time.Time

     

       12
       12
       +
       	Registered   *time.Time

     

       13
       13
       +
       	NeedsUpgrade bool

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       func (r *Registration) Status() Status {

     

       17
       17
       +
       	if r.NeedsUpgrade {

     

       18
       18
       +
       		return NeedsUpgrade

     

       19
       19
       +
       	} else if r.Registered != nil {

     

       20
       20
       +
       		return Registered

     

       21
       21
       +
       	} else {

     

       22
       22
       +
       		return Pending

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func (r *Registration) IsRegistered() bool {

     

       27
       27
       +
       	return r.Status() == Registered

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       func (r *Registration) IsNeedsUpgrade() bool {

     

       31
       31
       +
       	return r.Status() == NeedsUpgrade

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       func (r *Registration) IsPending() bool {

     

       35
       35
       +
       	return r.Status() == Pending

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       type Status uint32

     

       39
       39
       +
       

     

       40
       40
       +
       const (

     

       41
       41
       +
       	Registered Status = iota

     

       42
       42
       +
       	Pending

     

       43
       43
       +
       	NeedsUpgrade

     

       44
       44
       +
       )

+14 -63

appview/db/reaction.go

···

       5
       5
        
       	"time"

     

       6
       6
        
       

     

       7
       7
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
       +
       	"tangled.org/core/appview/models"

     

       8
       9
        
       )

     

       9
       10
        
       

     

       10
       10
       -
       type ReactionKind string

     

       11
       11
       -
       

     

       12
       12
       -
       const (

     

       13
       13
       -
       	Like        ReactionKind = "👍"

     

       14
       14
       -
       	Unlike      ReactionKind = "👎"

     

       15
       15
       -
       	Laugh       ReactionKind = "😆"

     

       16
       16
       -
       	Celebration ReactionKind = "🎉"

     

       17
       17
       -
       	Confused    ReactionKind = "🫤"

     

       18
       18
       -
       	Heart       ReactionKind = "❤️"

     

       19
       19
       -
       	Rocket      ReactionKind = "🚀"

     

       20
       20
       -
       	Eyes        ReactionKind = "👀"

     

       21
       21
       -
       )

     

       22
       22
       -
       

     

       23
       23
       -
       func (rk ReactionKind) String() string {

     

       24
       24
       -
       	return string(rk)

     

       25
       25
       -
       }

     

       26
       26
       -
       

     

       27
       27
       -
       var OrderedReactionKinds = []ReactionKind{

     

       28
       28
       -
       	Like,

     

       29
       29
       -
       	Unlike,

     

       30
       30
       -
       	Laugh,

     

       31
       31
       -
       	Celebration,

     

       32
       32
       -
       	Confused,

     

       33
       33
       -
       	Heart,

     

       34
       34
       -
       	Rocket,

     

       35
       35
       -
       	Eyes,

     

       36
       36
       -
       }

     

       37
       37
       -
       

     

       38
       38
       -
       func ParseReactionKind(raw string) (ReactionKind, bool) {

     

       39
       39
       -
       	k, ok := (map[string]ReactionKind{

     

       40
       40
       -
       		"👍":  Like,

     

       41
       41
       -
       		"👎":  Unlike,

     

       42
       42
       -
       		"😆":  Laugh,

     

       43
       43
       -
       		"🎉":  Celebration,

     

       44
       44
       -
       		"🫤":  Confused,

     

       45
       45
       -
       		"❤️": Heart,

     

       46
       46
       -
       		"🚀":  Rocket,

     

       47
       47
       -
       		"👀":  Eyes,

     

       48
       48
       -
       	})[raw]

     

       49
       49
       -
       	return k, ok

     

       50
       50
       -
       }

     

       51
       51
       -
       

     

       52
       52
       -
       type Reaction struct {

     

       53
       53
       -
       	ReactedByDid string

     

       54
       54
       -
       	ThreadAt     syntax.ATURI

     

       55
       55
       -
       	Created      time.Time

     

       56
       56
       -
       	Rkey         string

     

       57
       57
       -
       	Kind         ReactionKind

     

       58
       58
       -
       }

     

       59
       59
       -
       

     

       60
       60
       -
       func AddReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind ReactionKind, rkey string) error {

     

       11
       11
       +
       func AddReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind models.ReactionKind, rkey string) error {

     

       61
       12
        
       	query := `insert or ignore into reactions (reacted_by_did, thread_at, kind, rkey) values (?, ?, ?, ?)`

     

       62
       13
        
       	_, err := e.Exec(query, reactedByDid, threadAt, kind, rkey)

     

       63
       14
        
       	return err

     

       64
       15
        
       }

     

       65
       16
        
       

     

       66
       17
        
       // Get a reaction record

     

       67
       67
       -
       func GetReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind ReactionKind) (*Reaction, error) {

     

       18
       18
       +
       func GetReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind models.ReactionKind) (*models.Reaction, error) {

     

       68
       19
        
       	query := `

     

       69
       20
        
       	select reacted_by_did, thread_at, created, rkey

     

       70
       21
        
       	from reactions

     

       71
       22
        
       	where reacted_by_did = ? and thread_at = ? and kind = ?`

     

       72
       23
        
       	row := e.QueryRow(query, reactedByDid, threadAt, kind)

     

       73
       24
        
       

     

       74
       74
       -
       	var reaction Reaction

     

       25
       25
       +
       	var reaction models.Reaction

     

       75
       26
        
       	var created string

     

       76
       27
        
       	err := row.Scan(&reaction.ReactedByDid, &reaction.ThreadAt, &created, &reaction.Rkey)

     

       77
       28
        
       	if err != nil {

     
···

       90
       41
        
       }

     

       91
       42
        
       

     

       92
       43
        
       // Remove a reaction

     

       93
       93
       -
       func DeleteReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind ReactionKind) error {

     

       44
       44
       +
       func DeleteReaction(e Execer, reactedByDid string, threadAt syntax.ATURI, kind models.ReactionKind) error {

     

       94
       45
        
       	_, err := e.Exec(`delete from reactions where reacted_by_did = ? and thread_at = ? and kind = ?`, reactedByDid, threadAt, kind)

     

       95
       46
        
       	return err

     

       96
       47
        
       }

     
···

       101
       52
        
       	return err

     

       102
       53
        
       }

     

       103
       54
        
       

     

       104
       104
       -
       func GetReactionCount(e Execer, threadAt syntax.ATURI, kind ReactionKind) (int, error) {

     

       55
       55
       +
       func GetReactionCount(e Execer, threadAt syntax.ATURI, kind models.ReactionKind) (int, error) {

     

       105
       56
        
       	count := 0

     

       106
       57
        
       	err := e.QueryRow(

     

       107
       58
        
       		`select count(reacted_by_did) from reactions where thread_at = ? and kind = ?`, threadAt, kind).Scan(&count)

     
···

       111
       62
        
       	return count, nil

     

       112
       63
        
       }

     

       113
       64
        
       

     

       114
       114
       -
       func GetReactionCountMap(e Execer, threadAt syntax.ATURI) (map[ReactionKind]int, error) {

     

       115
       115
       -
       	countMap := map[ReactionKind]int{}

     

       116
       116
       -
       	for _, kind := range OrderedReactionKinds {

     

       65
       65
       +
       func GetReactionCountMap(e Execer, threadAt syntax.ATURI) (map[models.ReactionKind]int, error) {

     

       66
       66
       +
       	countMap := map[models.ReactionKind]int{}

     

       67
       67
       +
       	for _, kind := range models.OrderedReactionKinds {

     

       117
       68
        
       		count, err := GetReactionCount(e, threadAt, kind)

     

       118
       69
        
       		if err != nil {

     

       119
       119
       -
       			return map[ReactionKind]int{}, nil

     

       70
       70
       +
       			return map[models.ReactionKind]int{}, nil

     

       120
       71
        
       		}

     

       121
       72
        
       		countMap[kind] = count

     

       122
       73
        
       	}

     

       123
       74
        
       	return countMap, nil

     

       124
       75
        
       }

     

       125
       76
        
       

     

       126
       126
       -
       func GetReactionStatus(e Execer, userDid string, threadAt syntax.ATURI, kind ReactionKind) bool {

     

       77
       77
       +
       func GetReactionStatus(e Execer, userDid string, threadAt syntax.ATURI, kind models.ReactionKind) bool {

     

       127
       78
        
       	if _, err := GetReaction(e, userDid, threadAt, kind); err != nil {

     

       128
       79
        
       		return false

     

       129
       80
        
       	} else {

     
···

       131
       82
        
       	}

     

       132
       83
        
       }

     

       133
       84
        
       

     

       134
       134
       -
       func GetReactionStatusMap(e Execer, userDid string, threadAt syntax.ATURI) map[ReactionKind]bool {

     

       135
       135
       -
       	statusMap := map[ReactionKind]bool{}

     

       136
       136
       -
       	for _, kind := range OrderedReactionKinds {

     

       85
       85
       +
       func GetReactionStatusMap(e Execer, userDid string, threadAt syntax.ATURI) map[models.ReactionKind]bool {

     

       86
       86
       +
       	statusMap := map[models.ReactionKind]bool{}

     

       87
       87
       +
       	for _, kind := range models.OrderedReactionKinds {

     

       137
       88
        
       		count := GetReactionStatus(e, userDid, threadAt, kind)

     

       138
       89
        
       		statusMap[kind] = count

     

       139
       90
        
       	}

+57

appview/models/reaction.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type ReactionKind string

     

       10
       10
       +
       

     

       11
       11
       +
       const (

     

       12
       12
       +
       	Like        ReactionKind = "👍"

     

       13
       13
       +
       	Unlike      ReactionKind = "👎"

     

       14
       14
       +
       	Laugh       ReactionKind = "😆"

     

       15
       15
       +
       	Celebration ReactionKind = "🎉"

     

       16
       16
       +
       	Confused    ReactionKind = "🫤"

     

       17
       17
       +
       	Heart       ReactionKind = "❤️"

     

       18
       18
       +
       	Rocket      ReactionKind = "🚀"

     

       19
       19
       +
       	Eyes        ReactionKind = "👀"

     

       20
       20
       +
       )

     

       21
       21
       +
       

     

       22
       22
       +
       func (rk ReactionKind) String() string {

     

       23
       23
       +
       	return string(rk)

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       var OrderedReactionKinds = []ReactionKind{

     

       27
       27
       +
       	Like,

     

       28
       28
       +
       	Unlike,

     

       29
       29
       +
       	Laugh,

     

       30
       30
       +
       	Celebration,

     

       31
       31
       +
       	Confused,

     

       32
       32
       +
       	Heart,

     

       33
       33
       +
       	Rocket,

     

       34
       34
       +
       	Eyes,

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       func ParseReactionKind(raw string) (ReactionKind, bool) {

     

       38
       38
       +
       	k, ok := (map[string]ReactionKind{

     

       39
       39
       +
       		"👍":  Like,

     

       40
       40
       +
       		"👎":  Unlike,

     

       41
       41
       +
       		"😆":  Laugh,

     

       42
       42
       +
       		"🎉":  Celebration,

     

       43
       43
       +
       		"🫤":  Confused,

     

       44
       44
       +
       		"❤️": Heart,

     

       45
       45
       +
       		"🚀":  Rocket,

     

       46
       46
       +
       		"👀":  Eyes,

     

       47
       47
       +
       	})[raw]

     

       48
       48
       +
       	return k, ok

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       type Reaction struct {

     

       52
       52
       +
       	ReactedByDid string

     

       53
       53
       +
       	ThreadAt     syntax.ATURI

     

       54
       54
       +
       	Created      time.Time

     

       55
       55
       +
       	Rkey         string

     

       56
       56
       +
       	Kind         ReactionKind

     

       57
       57
       +
       }

+2 -1

appview/state/reaction.go

···

       11
       11
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       12
       12
        
       	"tangled.org/core/api/tangled"

     

       13
       13
        
       	"tangled.org/core/appview/db"

     

       14
       14
       +
       	"tangled.org/core/appview/models"

     

       14
       15
        
       	"tangled.org/core/appview/pages"

     

       15
       16
        
       	"tangled.org/core/tid"

     

       16
       17
        
       )

     
···

       30
       31
        
       		return

     

       31
       32
        
       	}

     

       32
       33
        
       

     

       33
       33
       -
       	reactionKind, ok := db.ParseReactionKind(r.URL.Query().Get("kind"))

     

       34
       34
       +
       	reactionKind, ok := models.ParseReactionKind(r.URL.Query().Get("kind"))

     

       34
       35
        
       	if !ok {

     

       35
       36
        
       		log.Println("invalid reaction kind")

     

       36
       37
        
       		return

+4 -9

appview/db/signup.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
       -
       import "time"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"tangled.org/core/appview/models"

     

       5
       5
       +
       )

     

       4
       6
        
       

     

       5
       5
       -
       type InflightSignup struct {

     

       6
       6
       -
       	Id         int64

     

       7
       7
       -
       	Email      string

     

       8
       8
       -
       	InviteCode string

     

       9
       9
       -
       	Created    time.Time

     

       10
       10
       -
       }

     

       11
       11
       -
       

     

       12
       12
       -
       func AddInflightSignup(e Execer, signup InflightSignup) error {

     

       7
       7
       +
       func AddInflightSignup(e Execer, signup models.InflightSignup) error {

     

       13
       8
        
       	query := `insert into signups_inflight (email, invite_code) values (?, ?)`

     

       14
       9
        
       	_, err := e.Exec(query, signup.Email, signup.InviteCode)

     

       15
       10
        
       	return err

+10

appview/models/signup.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       type InflightSignup struct {

     

       6
       6
       +
       	Id         int64

     

       7
       7
       +
       	Email      string

     

       8
       8
       +
       	InviteCode string

     

       9
       9
       +
       	Created    time.Time

     

       10
       10
       +
       }

+9 -27

appview/db/spindle.go

···

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
        
       

     

       9
       9
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       10
       10
        
       )

     

       11
       11
        
       

     

       12
       12
       -
       type Spindle struct {

     

       13
       13
       -
       	Id           int

     

       14
       14
       -
       	Owner        syntax.DID

     

       15
       15
       -
       	Instance     string

     

       16
       16
       -
       	Verified     *time.Time

     

       17
       17
       -
       	Created      time.Time

     

       18
       18
       -
       	NeedsUpgrade bool

     

       19
       19
       -
       }

     

       20
       20
       -
       

     

       21
       21
       -
       type SpindleMember struct {

     

       22
       22
       -
       	Id       int

     

       23
       23
       -
       	Did      syntax.DID // owner of the record

     

       24
       24
       -
       	Rkey     string     // rkey of the record

     

       25
       25
       -
       	Instance string

     

       26
       26
       -
       	Subject  syntax.DID // the member being added

     

       27
       27
       -
       	Created  time.Time

     

       28
       28
       -
       }

     

       29
       29
       -
       

     

       30
       30
       -
       func GetSpindles(e Execer, filters ...filter) ([]Spindle, error) {

     

       31
       31
       -
       	var spindles []Spindle

     

       12
       12
       +
       func GetSpindles(e Execer, filters ...filter) ([]models.Spindle, error) {

     

       13
       13
       +
       	var spindles []models.Spindle

     

       32
       14
        
       

     

       33
       15
        
       	var conditions []string

     

       34
       16
        
       	var args []any

     
···

       59
       41
        
       	defer rows.Close()

     

       60
       42
        
       

     

       61
       43
        
       	for rows.Next() {

     

       62
       62
       -
       		var spindle Spindle

     

       44
       44
       +
       		var spindle models.Spindle

     

       63
       45
        
       		var createdAt string

     

       64
       46
        
       		var verified sql.NullString

     

       65
       47
        
       		var needsUpgrade int

     
···

       100
       82
        
       }

     

       101
       83
        
       

     

       102
       84
        
       // if there is an existing spindle with the same instance, this returns an error

     

       103
       103
       -
       func AddSpindle(e Execer, spindle Spindle) error {

     

       85
       85
       +
       func AddSpindle(e Execer, spindle models.Spindle) error {

     

       104
       86
        
       	_, err := e.Exec(

     

       105
       87
        
       		`insert into spindles (owner, instance) values (?, ?)`,

     

       106
       88
        
       		spindle.Owner,

     
···

       151
       133
        
       	return err

     

       152
       134
        
       }

     

       153
       135
        
       

     

       154
       154
       -
       func AddSpindleMember(e Execer, member SpindleMember) error {

     

       136
       136
       +
       func AddSpindleMember(e Execer, member models.SpindleMember) error {

     

       155
       137
        
       	_, err := e.Exec(

     

       156
       138
        
       		`insert or ignore into spindle_members (did, rkey, instance, subject) values (?, ?, ?, ?)`,

     

       157
       139
        
       		member.Did,

     
···

       181
       163
        
       	return err

     

       182
       164
        
       }

     

       183
       165
        
       

     

       184
       184
       -
       func GetSpindleMembers(e Execer, filters ...filter) ([]SpindleMember, error) {

     

       185
       185
       -
       	var members []SpindleMember

     

       166
       166
       +
       func GetSpindleMembers(e Execer, filters ...filter) ([]models.SpindleMember, error) {

     

       167
       167
       +
       	var members []models.SpindleMember

     

       186
       168
        
       

     

       187
       169
        
       	var conditions []string

     

       188
       170
        
       	var args []any

     
···

       213
       195
        
       	defer rows.Close()

     

       214
       196
        
       

     

       215
       197
        
       	for rows.Next() {

     

       216
       216
       -
       		var member SpindleMember

     

       198
       198
       +
       		var member models.SpindleMember

     

       217
       199
        
       		var createdAt string

     

       218
       200
        
       

     

       219
       201
        
       		if err := rows.Scan(

+25

appview/models/spindle.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type Spindle struct {

     

       10
       10
       +
       	Id           int

     

       11
       11
       +
       	Owner        syntax.DID

     

       12
       12
       +
       	Instance     string

     

       13
       13
       +
       	Verified     *time.Time

     

       14
       14
       +
       	Created      time.Time

     

       15
       15
       +
       	NeedsUpgrade bool

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       type SpindleMember struct {

     

       19
       19
       +
       	Id       int

     

       20
       20
       +
       	Did      syntax.DID // owner of the record

     

       21
       21
       +
       	Rkey     string     // rkey of the record

     

       22
       22
       +
       	Instance string

     

       23
       23
       +
       	Subject  syntax.DID // the member being added

     

       24
       24
       +
       	Created  time.Time

     

       25
       25
       +
       }

+17

appview/models/star.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type Star struct {

     

       10
       10
       +
       	StarredByDid string

     

       11
       11
       +
       	RepoAt       syntax.ATURI

     

       12
       12
       +
       	Created      time.Time

     

       13
       13
       +
       	Rkey         string

     

       14
       14
       +
       

     

       15
       15
       +
       	// optionally, populate this when querying for reverse mappings

     

       16
       16
       +
       	Repo *Repo

     

       17
       17
       +
       }

+5 -110

appview/db/strings.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"bytes"

     

       5
       4
        
       	"database/sql"

     

       6
       5
        
       	"errors"

     

       7
       6
        
       	"fmt"

     

       8
       8
       -
       	"io"

     

       9
       7
        
       	"strings"

     

       10
       8
        
       	"time"

     

       11
       11
       -
       	"unicode/utf8"

     

       12
       9
        
       

     

       13
       13
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       14
       14
       -
       	"tangled.org/core/api/tangled"

     

       10
       10
       +
       	"tangled.org/core/appview/models"

     

       15
       11
        
       )

     

       16
       12
        
       

     

       17
       17
       -
       type String struct {

     

       18
       18
       -
       	Did  syntax.DID

     

       19
       19
       -
       	Rkey string

     

       20
       20
       -
       

     

       21
       21
       -
       	Filename    string

     

       22
       22
       -
       	Description string

     

       23
       23
       -
       	Contents    string

     

       24
       24
       -
       	Created     time.Time

     

       25
       25
       -
       	Edited      *time.Time

     

       26
       26
       -
       }

     

       27
       27
       -
       

     

       28
       28
       -
       func (s *String) StringAt() syntax.ATURI {

     

       29
       29
       -
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       type StringStats struct {

     

       33
       33
       -
       	LineCount uint64

     

       34
       34
       -
       	ByteCount uint64

     

       35
       35
       -
       }

     

       36
       36
       -
       

     

       37
       37
       -
       func (s String) Stats() StringStats {

     

       38
       38
       -
       	lineCount, err := countLines(strings.NewReader(s.Contents))

     

       39
       39
       -
       	if err != nil {

     

       40
       40
       -
       		// non-fatal

     

       41
       41
       -
       		// TODO: log this?

     

       42
       42
       -
       	}

     

       43
       43
       -
       

     

       44
       44
       -
       	return StringStats{

     

       45
       45
       -
       		LineCount: uint64(lineCount),

     

       46
       46
       -
       		ByteCount: uint64(len(s.Contents)),

     

       47
       47
       -
       	}

     

       48
       48
       -
       }

     

       49
       49
       -
       

     

       50
       50
       -
       func (s String) Validate() error {

     

       51
       51
       -
       	var err error

     

       52
       52
       -
       

     

       53
       53
       -
       	if utf8.RuneCountInString(s.Filename) > 140 {

     

       54
       54
       -
       		err = errors.Join(err, fmt.Errorf("filename too long"))

     

       55
       55
       -
       	}

     

       56
       56
       -
       

     

       57
       57
       -
       	if utf8.RuneCountInString(s.Description) > 280 {

     

       58
       58
       -
       		err = errors.Join(err, fmt.Errorf("description too long"))

     

       59
       59
       -
       	}

     

       60
       60
       -
       

     

       61
       61
       -
       	if len(s.Contents) == 0 {

     

       62
       62
       -
       		err = errors.Join(err, fmt.Errorf("contents is empty"))

     

       63
       63
       -
       	}

     

       64
       64
       -
       

     

       65
       65
       -
       	return err

     

       66
       66
       -
       }

     

       67
       67
       -
       

     

       68
       68
       -
       func (s *String) AsRecord() tangled.String {

     

       69
       69
       -
       	return tangled.String{

     

       70
       70
       -
       		Filename:    s.Filename,

     

       71
       71
       -
       		Description: s.Description,

     

       72
       72
       -
       		Contents:    s.Contents,

     

       73
       73
       -
       		CreatedAt:   s.Created.Format(time.RFC3339),

     

       74
       74
       -
       	}

     

       75
       75
       -
       }

     

       76
       76
       -
       

     

       77
       77
       -
       func StringFromRecord(did, rkey string, record tangled.String) String {

     

       78
       78
       -
       	created, err := time.Parse(record.CreatedAt, time.RFC3339)

     

       79
       79
       -
       	if err != nil {

     

       80
       80
       -
       		created = time.Now()

     

       81
       81
       -
       	}

     

       82
       82
       -
       	return String{

     

       83
       83
       -
       		Did:         syntax.DID(did),

     

       84
       84
       -
       		Rkey:        rkey,

     

       85
       85
       -
       		Filename:    record.Filename,

     

       86
       86
       -
       		Description: record.Description,

     

       87
       87
       -
       		Contents:    record.Contents,

     

       88
       88
       -
       		Created:     created,

     

       89
       89
       -
       	}

     

       90
       90
       -
       }

     

       91
       91
       -
       

     

       92
       92
       -
       func AddString(e Execer, s String) error {

     

       13
       13
       +
       func AddString(e Execer, s models.String) error {

     

       93
       14
        
       	_, err := e.Exec(

     

       94
       15
        
       		`insert into strings (

     

       95
       16
        
       			did,

     
···

       123
       44
        
       	return err

     

       124
       45
        
       }

     

       125
       46
        
       

     

       126
       126
       -
       func GetStrings(e Execer, limit int, filters ...filter) ([]String, error) {

     

       127
       127
       -
       	var all []String

     

       47
       47
       +
       func GetStrings(e Execer, limit int, filters ...filter) ([]models.String, error) {

     

       48
       48
       +
       	var all []models.String

     

       128
       49
        
       

     

       129
       50
        
       	var conditions []string

     

       130
       51
        
       	var args []any

     
···

       167
       88
        
       	defer rows.Close()

     

       168
       89
        
       

     

       169
       90
        
       	for rows.Next() {

     

       170
       170
       -
       		var s String

     

       91
       91
       +
       		var s models.String

     

       171
       92
        
       		var createdAt string

     

       172
       93
        
       		var editedAt sql.NullString

     

       173
       94
        
       

     
···

       248
       169
        
       	_, err := e.Exec(query, args...)

     

       249
       170
        
       	return err

     

       250
       171
        
       }

     

       251
       251
       -
       

     

       252
       252
       -
       func countLines(r io.Reader) (int, error) {

     

       253
       253
       -
       	buf := make([]byte, 32*1024)

     

       254
       254
       -
       	bufLen := 0

     

       255
       255
       -
       	count := 0

     

       256
       256
       -
       	nl := []byte{'\n'}

     

       257
       257
       -
       

     

       258
       258
       -
       	for {

     

       259
       259
       -
       		c, err := r.Read(buf)

     

       260
       260
       -
       		if c > 0 {

     

       261
       261
       -
       			bufLen += c

     

       262
       262
       -
       		}

     

       263
       263
       -
       		count += bytes.Count(buf[:c], nl)

     

       264
       264
       -
       

     

       265
       265
       -
       		switch {

     

       266
       266
       -
       		case err == io.EOF:

     

       267
       267
       -
       			/* handle last line not having a newline at the end */

     

       268
       268
       -
       			if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' {

     

       269
       269
       -
       				count++

     

       270
       270
       -
       			}

     

       271
       271
       -
       			return count, nil

     

       272
       272
       -
       		case err != nil:

     

       273
       273
       -
       			return 0, err

     

       274
       274
       -
       		}

     

       275
       275
       -
       	}

     

       276
       276
       -
       }

+95

appview/models/string.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bytes"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"io"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       	"time"

     

       9
       9
       +
       

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       11
       11
       +
       	"tangled.org/core/api/tangled"

     

       12
       12
       +
       )

     

       13
       13
       +
       

     

       14
       14
       +
       type String struct {

     

       15
       15
       +
       	Did  syntax.DID

     

       16
       16
       +
       	Rkey string

     

       17
       17
       +
       

     

       18
       18
       +
       	Filename    string

     

       19
       19
       +
       	Description string

     

       20
       20
       +
       	Contents    string

     

       21
       21
       +
       	Created     time.Time

     

       22
       22
       +
       	Edited      *time.Time

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       func (s *String) StringAt() syntax.ATURI {

     

       26
       26
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func (s *String) AsRecord() tangled.String {

     

       30
       30
       +
       	return tangled.String{

     

       31
       31
       +
       		Filename:    s.Filename,

     

       32
       32
       +
       		Description: s.Description,

     

       33
       33
       +
       		Contents:    s.Contents,

     

       34
       34
       +
       		CreatedAt:   s.Created.Format(time.RFC3339),

     

       35
       35
       +
       	}

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       func StringFromRecord(did, rkey string, record tangled.String) String {

     

       39
       39
       +
       	created, err := time.Parse(record.CreatedAt, time.RFC3339)

     

       40
       40
       +
       	if err != nil {

     

       41
       41
       +
       		created = time.Now()

     

       42
       42
       +
       	}

     

       43
       43
       +
       	return String{

     

       44
       44
       +
       		Did:         syntax.DID(did),

     

       45
       45
       +
       		Rkey:        rkey,

     

       46
       46
       +
       		Filename:    record.Filename,

     

       47
       47
       +
       		Description: record.Description,

     

       48
       48
       +
       		Contents:    record.Contents,

     

       49
       49
       +
       		Created:     created,

     

       50
       50
       +
       	}

     

       51
       51
       +
       }

     

       52
       52
       +
       

     

       53
       53
       +
       type StringStats struct {

     

       54
       54
       +
       	LineCount uint64

     

       55
       55
       +
       	ByteCount uint64

     

       56
       56
       +
       }

     

       57
       57
       +
       

     

       58
       58
       +
       func (s String) Stats() StringStats {

     

       59
       59
       +
       	lineCount, err := countLines(strings.NewReader(s.Contents))

     

       60
       60
       +
       	if err != nil {

     

       61
       61
       +
       		// non-fatal

     

       62
       62
       +
       		// TODO: log this?

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	return StringStats{

     

       66
       66
       +
       		LineCount: uint64(lineCount),

     

       67
       67
       +
       		ByteCount: uint64(len(s.Contents)),

     

       68
       68
       +
       	}

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       71
       71
       +
       func countLines(r io.Reader) (int, error) {

     

       72
       72
       +
       	buf := make([]byte, 32*1024)

     

       73
       73
       +
       	bufLen := 0

     

       74
       74
       +
       	count := 0

     

       75
       75
       +
       	nl := []byte{'\n'}

     

       76
       76
       +
       

     

       77
       77
       +
       	for {

     

       78
       78
       +
       		c, err := r.Read(buf)

     

       79
       79
       +
       		if c > 0 {

     

       80
       80
       +
       			bufLen += c

     

       81
       81
       +
       		}

     

       82
       82
       +
       		count += bytes.Count(buf[:c], nl)

     

       83
       83
       +
       

     

       84
       84
       +
       		switch {

     

       85
       85
       +
       		case err == io.EOF:

     

       86
       86
       +
       			/* handle last line not having a newline at the end */

     

       87
       87
       +
       			if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' {

     

       88
       88
       +
       				count++

     

       89
       89
       +
       			}

     

       90
       90
       +
       			return count, nil

     

       91
       91
       +
       		case err != nil:

     

       92
       92
       +
       			return 0, err

     

       93
       93
       +
       		}

     

       94
       94
       +
       	}

     

       95
       95
       +
       }

+2 -3

appview/posthog/notifier.go

···

       5
       5
        
       	"log"

     

       6
       6
        
       

     

       7
       7
        
       	"github.com/posthog/posthog-go"

     

       8
       8
       -
       	"tangled.org/core/appview/db"

     

       9
       8
        
       	"tangled.org/core/appview/models"

     

       10
       9
        
       	"tangled.org/core/appview/notify"

     

       11
       10
        
       )

     
···

       142
       141
        
       	}

     

       143
       142
        
       }

     

       144
       143
        
       

     

       145
       145
       -
       func (n *posthogNotifier) EditString(ctx context.Context, string *db.String) {

     

       144
       144
       +
       func (n *posthogNotifier) EditString(ctx context.Context, string *models.String) {

     

       146
       145
        
       	err := n.client.Enqueue(posthog.Capture{

     

       147
       146
        
       		DistinctId: string.Did.String(),

     

       148
       147
        
       		Event:      "edit_string",

     
···

       153
       152
        
       	}

     

       154
       153
        
       }

     

       155
       154
        
       

     

       156
       156
       -
       func (n *posthogNotifier) CreateString(ctx context.Context, string *db.String) {

     

       155
       155
       +
       func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) {

     

       157
       156
        
       	err := n.client.Enqueue(posthog.Capture{

     

       158
       157
        
       		DistinctId: string.Did.String(),

     

       159
       158
        
       		Event:      "create_string",

+3 -2

appview/strings/strings.go

···

       11
       11
        
       	"tangled.org/core/api/tangled"

     

       12
       12
        
       	"tangled.org/core/appview/db"

     

       13
       13
        
       	"tangled.org/core/appview/middleware"

     

       14
       14
       +
       	"tangled.org/core/appview/models"

     

       14
       15
        
       	"tangled.org/core/appview/notify"

     

       15
       16
        
       	"tangled.org/core/appview/oauth"

     

       16
       17
        
       	"tangled.org/core/appview/pages"

     
···

       235
       236
        
       		description := r.FormValue("description")

     

       236
       237
        
       

     

       237
       238
        
       		// construct new string from form values

     

       238
       238
       -
       		entry := db.String{

     

       239
       239
       +
       		entry := models.String{

     

       239
       240
        
       			Did:         first.Did,

     

       240
       241
        
       			Rkey:        first.Rkey,

     

       241
       242
        
       			Filename:    filename,

     
···

       318
       319
        
       

     

       319
       320
        
       		description := r.FormValue("description")

     

       320
       321
        
       

     

       321
       321
       -
       		string := db.String{

     

       322
       322
       +
       		string := models.String{

     

       322
       323
        
       			Did:         syntax.DID(user.Did),

     

       323
       324
        
       			Rkey:        tid.TID(),

     

       324
       325
        
       			Filename:    filename,

+27

appview/validator/string.go

···

       1
       1
       +
       package validator

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"errors"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"unicode/utf8"

     

       7
       7
       +
       

     

       8
       8
       +
       	"tangled.org/core/appview/models"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func (v *Validator) ValidateString(s *models.String) error {

     

       12
       12
       +
       	var err error

     

       13
       13
       +
       

     

       14
       14
       +
       	if utf8.RuneCountInString(s.Filename) > 140 {

     

       15
       15
       +
       		err = errors.Join(err, fmt.Errorf("filename too long"))

     

       16
       16
       +
       	}

     

       17
       17
       +
       

     

       18
       18
       +
       	if utf8.RuneCountInString(s.Description) > 280 {

     

       19
       19
       +
       		err = errors.Join(err, fmt.Errorf("description too long"))

     

       20
       20
       +
       	}

     

       21
       21
       +
       

     

       22
       22
       +
       	if len(s.Contents) == 0 {

     

       23
       23
       +
       		err = errors.Join(err, fmt.Errorf("contents is empty"))

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	return err

     

       27
       27
       +
       }

+11 -32

appview/db/timeline.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"sort"

     

       5
       5
       -
       	"time"

     

       6
       5
        
       

     

       7
       6
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       7
        
       	"tangled.org/core/appview/models"

     

       9
       8
        
       )

     

       10
       9
        
       

     

       11
       11
       -
       type TimelineEvent struct {

     

       12
       12
       -
       	*models.Repo

     

       13
       13
       -
       	*models.Follow

     

       14
       14
       -
       	*models.Star

     

       15
       15
       -
       

     

       16
       16
       -
       	EventAt time.Time

     

       17
       17
       -
       

     

       18
       18
       -
       	// optional: populate only if Repo is a fork

     

       19
       19
       -
       	Source *models.Repo

     

       20
       20
       -
       

     

       21
       21
       -
       	// optional: populate only if event is Follow

     

       22
       22
       -
       	*models.Profile

     

       23
       23
       -
       	*models.FollowStats

     

       24
       24
       -
       	*models.FollowStatus

     

       25
       25
       -
       

     

       26
       26
       -
       	// optional: populate only if event is Repo

     

       27
       27
       -
       	IsStarred bool

     

       28
       28
       -
       	StarCount int64

     

       29
       29
       -
       }

     

       30
       30
       -
       

     

       31
       10
        
       // TODO: this gathers heterogenous events from different sources and aggregates

     

       32
       11
        
       // them in code; if we did this entirely in sql, we could order and limit and paginate easily

     

       33
       33
       -
       func MakeTimeline(e Execer, limit int, loggedInUserDid string) ([]TimelineEvent, error) {

     

       34
       34
       -
       	var events []TimelineEvent

     

       12
       12
       +
       func MakeTimeline(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       13
       13
       +
       	var events []models.TimelineEvent

     

       35
       14
        
       

     

       36
       15
        
       	repos, err := getTimelineRepos(e, limit, loggedInUserDid)

     

       37
       16
        
       	if err != nil {

     
···

       91
       70
        
       	return isStarred, starCount

     

       92
       71
        
       }

     

       93
       72
        
       

     

       94
       94
       -
       func getTimelineRepos(e Execer, limit int, loggedInUserDid string) ([]TimelineEvent, error) {

     

       73
       73
       +
       func getTimelineRepos(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       95
       74
        
       	repos, err := GetRepos(e, limit)

     

       96
       75
        
       	if err != nil {

     

       97
       76
        
       		return nil, err

     
···

       123
       102
        
       		return nil, err

     

       124
       103
        
       	}

     

       125
       104
        
       

     

       126
       126
       -
       	var events []TimelineEvent

     

       105
       105
       +
       	var events []models.TimelineEvent

     

       127
       106
        
       	for _, r := range repos {

     

       128
       107
        
       		var source *models.Repo

     

       129
       108
        
       		if r.Source != "" {

     
···

       134
       113
        
       

     

       135
       114
        
       		isStarred, starCount := getRepoStarInfo(&r, starStatuses)

     

       136
       115
        
       

     

       137
       137
       -
       		events = append(events, TimelineEvent{

     

       116
       116
       +
       		events = append(events, models.TimelineEvent{

     

       138
       117
        
       			Repo:      &r,

     

       139
       118
        
       			EventAt:   r.Created,

     

       140
       119
        
       			Source:    source,

     
···

       146
       125
        
       	return events, nil

     

       147
       126
        
       }

     

       148
       127
        
       

     

       149
       149
       -
       func getTimelineStars(e Execer, limit int, loggedInUserDid string) ([]TimelineEvent, error) {

     

       128
       128
       +
       func getTimelineStars(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       150
       129
        
       	stars, err := GetStars(e, limit)

     

       151
       130
        
       	if err != nil {

     

       152
       131
        
       		return nil, err

     
···

       172
       151
        
       		return nil, err

     

       173
       152
        
       	}

     

       174
       153
        
       

     

       175
       175
       -
       	var events []TimelineEvent

     

       154
       154
       +
       	var events []models.TimelineEvent

     

       176
       155
        
       	for _, s := range stars {

     

       177
       156
        
       		isStarred, starCount := getRepoStarInfo(s.Repo, starStatuses)

     

       178
       157
        
       

     

       179
       179
       -
       		events = append(events, TimelineEvent{

     

       158
       158
       +
       		events = append(events, models.TimelineEvent{

     

       180
       159
        
       			Star:      &s,

     

       181
       160
        
       			EventAt:   s.Created,

     

       182
       161
        
       			IsStarred: isStarred,

     
···

       187
       166
        
       	return events, nil

     

       188
       167
        
       }

     

       189
       168
        
       

     

       190
       190
       -
       func getTimelineFollows(e Execer, limit int, loggedInUserDid string) ([]TimelineEvent, error) {

     

       169
       169
       +
       func getTimelineFollows(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) {

     

       191
       170
        
       	follows, err := GetFollows(e, limit)

     

       192
       171
        
       	if err != nil {

     

       193
       172
        
       		return nil, err

     
···

       220
       199
        
       		}

     

       221
       200
        
       	}

     

       222
       201
        
       

     

       223
       223
       -
       	var events []TimelineEvent

     

       202
       202
       +
       	var events []models.TimelineEvent

     

       224
       203
        
       	for _, f := range follows {

     

       225
       204
        
       		profile, _ := profiles[f.SubjectDid]

     

       226
       205
        
       		followStatMap, _ := followStatMap[f.SubjectDid]

     
···

       230
       209
        
       			followStatus = followStatuses[f.SubjectDid]

     

       231
       210
        
       		}

     

       232
       211
        
       

     

       233
       233
       -
       		events = append(events, TimelineEvent{

     

       212
       212
       +
       		events = append(events, models.TimelineEvent{

     

       234
       213
        
       			Follow:       &f,

     

       235
       214
        
       			Profile:      profile,

     

       236
       215
        
       			FollowStats:  &followStatMap,

+23

appview/models/timeline.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       type TimelineEvent struct {

     

       6
       6
       +
       	*Repo

     

       7
       7
       +
       	*Follow

     

       8
       8
       +
       	*Star

     

       9
       9
       +
       

     

       10
       10
       +
       	EventAt time.Time

     

       11
       11
       +
       

     

       12
       12
       +
       	// optional: populate only if Repo is a fork

     

       13
       13
       +
       	Source *Repo

     

       14
       14
       +
       

     

       15
       15
       +
       	// optional: populate only if event is Follow

     

       16
       16
       +
       	*Profile

     

       17
       17
       +
       	*FollowStats

     

       18
       18
       +
       	*FollowStatus

     

       19
       19
       +
       

     

       20
       20
       +
       	// optional: populate only if event is Repo

     

       21
       21
       +
       	IsStarred bool

     

       22
       22
       +
       	StarCount int64

     

       23
       23
       +
       }

+1 -1

appview/db/label.go

···

       349
       349
        
       		defs[l.AtUri().String()] = &l

     

       350
       350
        
       	}

     

       351
       351
        
       

     

       352
       352
       -
       	return &models.LabelApplicationCtx{defs}, nil

     

       352
       352
       +
       	return &models.LabelApplicationCtx{Defs: defs}, nil

     

       353
       353
        
       }

+30

appview/pages/funcmap_test.go

···

       1
       1
       +
       package pages

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"html/template"

     

       5
       5
       +
       	"tangled.org/core/appview/config"

     

       6
       6
       +
       	"tangled.org/core/idresolver"

     

       7
       7
       +
       	"testing"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func TestPages_funcMap(t *testing.T) {

     

       11
       11
       +
       	tests := []struct {

     

       12
       12
       +
       		name string // description of this test case

     

       13
       13
       +
       		// Named input parameters for receiver constructor.

     

       14
       14
       +
       		config *config.Config

     

       15
       15
       +
       		res    *idresolver.Resolver

     

       16
       16
       +
       		want   template.FuncMap

     

       17
       17
       +
       	}{

     

       18
       18
       +
       		// TODO: Add test cases.

     

       19
       19
       +
       	}

     

       20
       20
       +
       	for _, tt := range tests {

     

       21
       21
       +
       		t.Run(tt.name, func(t *testing.T) {

     

       22
       22
       +
       			p := NewPages(tt.config, tt.res)

     

       23
       23
       +
       			got := p.funcMap()

     

       24
       24
       +
       			// TODO: update the condition below to compare got with tt.want.

     

       25
       25
       +
       			if true {

     

       26
       26
       +
       				t.Errorf("funcMap() = %v, want %v", got, tt.want)

     

       27
       27
       +
       			}

     

       28
       28
       +
       		})

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

+1 -1

appview/reporesolver/resolver.go

···

       212
       212
        
       func (f *ResolvedRepo) RolesInRepo(u *oauth.User) repoinfo.RolesInRepo {

     

       213
       213
        
       	if u != nil {

     

       214
       214
        
       		r := f.rr.enforcer.GetPermissionsInRepo(u.Did, f.Knot, f.DidSlashRepo())

     

       215
       215
       -
       		return repoinfo.RolesInRepo{r}

     

       215
       215
       +
       		return repoinfo.RolesInRepo{Roles: r}

     

       216
       216
        
       	} else {

     

       217
       217
        
       		return repoinfo.RolesInRepo{}

     

       218
       218
        
       	}

.tangled/workflows/test.yml

···

       14
       14
        
           command: |

     

       15
       15
        
             mkdir -p appview/pages/static; touch appview/pages/static/x

     

       16
       16
        
       

     

       17
       17
       +
         - name: run linter

     

       18
       18
       +
           environment:

     

       19
       19
       +
             CGO_ENABLED: 1

     

       20
       20
       +
           command: |

     

       21
       21
       +
             go vet -v ./...

     

       22
       22
       +
       

     

       17
       23
        
         - name: run all tests

     

       18
       24
        
           environment:

     

       19
       25
        
             CGO_ENABLED: 1

+1 -1

knotserver/ingester.go

···

       151
       151
        
       		return fmt.Errorf("failed to construct absolute repo path: %w", err)

     

       152
       152
        
       	}

     

       153
       153
        
       

     

       154
       154
       -
       	gr, err := git.Open(repoPath, record.Source.Branch)

     

       154
       154
       +
       	gr, err := git.Open(repoPath, record.Source.Sha)

     

       155
       155
        
       	if err != nil {

     

       156
       156
        
       		return fmt.Errorf("failed to open git repository: %w", err)

     

       157
       157
        
       	}

+11

appview/db/star.go

···

       5
       5
        
       	"errors"

     

       6
       6
        
       	"fmt"

     

       7
       7
        
       	"log"

     

       8
       8
       +
       	"slices"

     

       8
       9
        
       	"strings"

     

       9
       10
        
       	"time"

     

       10
       11
        
       

     
···

       209
       210
        
       		stars = append(stars, s...)

     

       210
       211
        
       	}

     

       211
       212
        
       

     

       213
       213
       +
       	slices.SortFunc(stars, func(a, b models.Star) int {

     

       214
       214
       +
       		if a.Created.After(b.Created) {

     

       215
       215
       +
       			return -1

     

       216
       216
       +
       		}

     

       217
       217
       +
       		if b.Created.After(a.Created) {

     

       218
       218
       +
       			return 1

     

       219
       219
       +
       		}

     

       220
       220
       +
       		return 0

     

       221
       221
       +
       	})

     

       222
       222
       +
       

     

       212
       223
        
       	return stars, nil

     

       213
       224
        
       }

     

       214
       225

+2 -3

appview/repo/router.go

···

       21
       21
        
       	r.Route("/tags", func(r chi.Router) {

     

       22
       22
        
       		r.Get("/", rp.RepoTags)

     

       23
       23
        
       		r.Route("/{tag}", func(r chi.Router) {

     

       24
       24
       -
       			r.Use(middleware.AuthMiddleware(rp.oauth))

     

       25
       25
       -
       			// require auth to download for now

     

       26
       24
        
       			r.Get("/download/{file}", rp.DownloadArtifact)

     

       27
       25
        
       

     

       28
       26
        
       			// require repo:push to upload or delete artifacts

     
···

       30
       28
        
       			// additionally: only the uploader can truly delete an artifact

     

       31
       29
        
       			// (record+blob will live on their pds)

     

       32
       30
        
       			r.Group(func(r chi.Router) {

     

       33
       33
       -
       				r.With(mw.RepoPermissionMiddleware("repo:push"))

     

       31
       31
       +
       				r.Use(middleware.AuthMiddleware(rp.oauth))

     

       32
       32
       +
       				r.Use(mw.RepoPermissionMiddleware("repo:push"))

     

       34
       33
        
       				r.Post("/upload", rp.AttachArtifact)

     

       35
       34
        
       				r.Delete("/{file}", rp.DeleteArtifact)

     

       36
       35
        
       			})

+10 -33

appview/pages/templates/timeline/fragments/timeline.html

···

       82
       82
        
         {{ $event := index . 1 }}

     

       83
       83
        
         {{ $follow := $event.Follow }}

     

       84
       84
        
         {{ $profile := $event.Profile }}

     

       85
       85
       -
         {{ $stat := $event.FollowStats }}

     

       85
       85
       +
         {{ $followStats := $event.FollowStats }}

     

       86
       86
       +
         {{ $followStatus := $event.FollowStatus }}

     

       86
       87
        
       

     

       87
       88
        
         {{ $userHandle :=  resolve $follow.UserDid }}

     

       88
       89
        
         {{ $subjectHandle :=  resolve $follow.SubjectDid }}

     
···

       92
       93
        
             {{ template "user/fragments/picHandleLink" $subjectHandle }}

     

       93
       94
        
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span>

     

       94
       95
        
         </div>

     

       95
       95
       -
         <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex flex-col md:flex-row md:items-center gap-4">

     

       96
       96
       -
           <div class="flex items-center gap-4 flex-1">

     

       97
       97
       -
             <div class="flex-shrink-0 max-h-full w-24 h-24">

     

       98
       98
       -
               <img alt="" class="object-cover rounded-full p-2" src="{{ fullAvatar $subjectHandle }}" />

     

       99
       99
       -
             </div>

     

       100
       100
       -
       

     

       101
       101
       -
             <div class="flex-1 min-h-0 justify-around flex flex-col">

     

       102
       102
       -
               <a href="/{{ $subjectHandle }}">

     

       103
       103
       -
                 <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span>

     

       104
       104
       -
               </a>

     

       105
       105
       -
               {{ with $profile }}

     

       106
       106
       -
                 {{ with .Description }}

     

       107
       107
       -
                   <p class="text-sm pb-2 md:pb-2">{{.}}</p>

     

       108
       108
       -
                 {{ end }}

     

       109
       109
       -
               {{ end }}

     

       110
       110
       -
               {{ with $stat }}

     

       111
       111
       -
                 <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full">

     

       112
       112
       -
                   <span class="flex-shrink-0">{{ i "users" "size-4" }}</span>

     

       113
       113
       -
                   <span id="followers"><a href="/{{ $subjectHandle }}?tab=followers">{{ .Followers }} followers</a></span>

     

       114
       114
       -
                   <span class="select-none after:content-['·']"></span>

     

       115
       115
       -
                   <span id="following"><a href="/{{ $subjectHandle }}?tab=following">{{ .Following }} following</a></span>

     

       116
       116
       -
                 </div>

     

       117
       117
       -
               {{ end }}

     

       118
       118
       -
             </div>

     

       119
       119
       -
           </div>

     

       120
       120
       -
           

     

       121
       121
       -
           {{ if and $root.LoggedInUser (ne $event.FollowStatus.String "IsSelf") }}

     

       122
       122
       -
             <div class="flex-shrink-0 w-fit ml-auto">

     

       123
       123
       -
               {{ template "user/fragments/follow" (dict "UserDid" $follow.SubjectDid "FollowStatus" $event.FollowStatus) }}

     

       124
       124
       -
             </div>

     

       125
       125
       -
           {{ end }}

     

       126
       126
       -
         </div>

     

       96
       96
       +
         {{ template "user/fragments/followCard" 

     

       97
       97
       +
             (dict

     

       98
       98
       +
                 "LoggedInUser" $root.LoggedInUser

     

       99
       99
       +
                 "UserDid" $follow.SubjectDid

     

       100
       100
       +
                 "Profile" $profile

     

       101
       101
       +
                 "FollowStatus" $followStatus

     

       102
       102
       +
                 "FollowersCount" $followStats.Followers

     

       103
       103
       +
                 "FollowingCount" $followStats.Following) }}

     

       127
       104
        
       {{ end }}

+8 -1

appview/pages/templates/user/followers.html

···

       10
       10
        
         <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWERS</p>

     

       11
       11
        
         <div id="followers" class="grid grid-cols-1 gap-4 mb-6">

     

       12
       12
        
           {{ range .Followers }}

     

       13
       13
       -
              {{ template "user/fragments/followCard" . }}

     

       13
       13
       +
              {{ template "user/fragments/followCard"

     

       14
       14
       +
                 (dict

     

       15
       15
       +
                     "LoggedInUser" $.LoggedInUser

     

       16
       16
       +
                     "UserDid" .UserDid

     

       17
       17
       +
                     "Profile" .Profile

     

       18
       18
       +
                     "FollowStatus" .FollowStatus

     

       19
       19
       +
                     "FollowersCount" .FollowersCount

     

       20
       20
       +
                     "FollowingCount" .FollowingCount) }}

     

       14
       21
        
           {{ else }}

     

       15
       22
        
               <p class="px-6 dark:text-white">This user does not have any followers yet.</p>

     

       16
       23
        
           {{ end }}

+8 -1

appview/pages/templates/user/following.html

···

       10
       10
        
         <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWING</p>

     

       11
       11
        
         <div id="following" class="grid grid-cols-1 gap-4 mb-6">

     

       12
       12
        
           {{ range .Following }}

     

       13
       13
       -
              {{ template "user/fragments/followCard" . }}

     

       13
       13
       +
              {{ template "user/fragments/followCard"

     

       14
       14
       +
                 (dict

     

       15
       15
       +
                     "LoggedInUser" $.LoggedInUser

     

       16
       16
       +
                     "UserDid" .UserDid

     

       17
       17
       +
                     "Profile" .Profile

     

       18
       18
       +
                     "FollowStatus" .FollowStatus

     

       19
       19
       +
                     "FollowersCount" .FollowersCount

     

       20
       20
       +
                     "FollowingCount" .FollowingCount) }}

     

       14
       21
        
           {{ else }}

     

       15
       22
        
               <p class="px-6 dark:text-white">This user does not follow anyone yet.</p>

     

       16
       23
        
           {{ end }}

+6 -2

appview/pages/templates/user/fragments/follow.html

···

       1
       1
        
       {{ define "user/fragments/follow" }}

     

       2
       2
        
         <button id="{{ normalizeForHtmlId .UserDid }}"

     

       3
       3
       -
           class="btn mt-2 flex gap-2 items-center group"

     

       3
       3
       +
           class="btn w-full flex gap-2 items-center group"

     

       4
       4
        
       

     

       5
       5
        
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       6
       6
        
           hx-post="/follow?subject={{.UserDid}}"

     
···

       12
       12
        
           hx-target="#{{ normalizeForHtmlId .UserDid }}"

     

       13
       13
        
           hx-swap="outerHTML"

     

       14
       14
        
           >

     

       15
       15
       -
           {{ if eq .FollowStatus.String "IsNotFollowing" }}{{ i "user-round-plus" "w-4 h-4" }} follow{{ else }}{{ i "user-round-minus" "w-4 h-4" }} unfollow{{ end }}

     

       15
       15
       +
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       16
       16
       +
             {{ i "user-round-plus" "w-4 h-4" }} follow

     

       17
       17
       +
           {{ else }}

     

       18
       18
       +
             {{ i "user-round-minus" "w-4 h-4" }} unfollow

     

       19
       19
       +
           {{ end }}

     

       16
       20
        
           {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       17
       21
        
         </button>

     

       18
       22
        
       {{ end }}

+10 -10

appview/pages/templates/user/fragments/repoCard.html

···

       14
       14
        
         {{ with $repo }}

     

       15
       15
        
           <div class="py-4 px-6 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800 min-h-32">

     

       16
       16
        
             <div class="font-medium dark:text-white flex items-center justify-between">

     

       17
       17
       -
               <div class="flex items-center">

     

       18
       18
       -
               {{ if .Source }}

     

       19
       19
       -
                 {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }}

     

       20
       20
       -
               {{ else }}

     

       21
       21
       -
                 {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }}

     

       22
       22
       -
               {{ end }}

     

       23
       23
       -
       

     

       17
       17
       +
               <div class="flex items-center min-w-0 flex-1 mr-2">

     

       18
       18
       +
                 {{ if .Source }}

     

       19
       19
       +
                   {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }}

     

       20
       20
       +
                 {{ else }}

     

       21
       21
       +
                   {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }}

     

       22
       22
       +
                 {{ end }}

     

       24
       23
        
                 {{ $repoOwner := resolve .Did }}

     

       25
       24
        
                 {{- if $fullName -}}

     

       26
       26
       -
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ $repoOwner }}/{{ .Name }}</a>

     

       25
       25
       +
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate min-w-0">{{ $repoOwner }}/{{ .Name }}</a>

     

       27
       26
        
                 {{- else -}}

     

       28
       28
       -
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ .Name }}</a>

     

       27
       27
       +
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate min-w-0">{{ .Name }}</a>

     

       29
       28
        
                 {{- end -}}

     

       30
       29
        
               </div>

     

       31
       31
       -
               

     

       32
       30
        
               {{ if and $starButton $root.LoggedInUser }}

     

       31
       31
       +
               <div class="shrink-0">

     

       33
       32
        
                 {{ template "repo/fragments/repoStar" $starData }}

     

       33
       33
       +
               </div>

     

       34
       34
        
               {{ end }}

     

       35
       35
        
             </div>

     

       36
       36
        
             {{ with .Description }}

appview/state/profile.go

···

       336
       336
        
       			profile.Did = did

     

       337
       337
        
       		}

     

       338
       338
        
       		followCards[i] = pages.FollowCard{

     

       339
       339
       +
       			LoggedInUser:   loggedInUser,

     

       339
       340
        
       			UserDid:        did,

     

       340
       341
        
       			FollowStatus:   followStatus,

     

       341
       342
        
       			FollowersCount: followStats.Followers,

+58 -3

appview/posthog/notifier.go appview/notify/posthog/notifier.go

···

       1
       1
       -
       package posthog_service

     

       1
       1
       +
       package posthog

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     
···

       98
       98
        
       	}

     

       99
       99
        
       }

     

       100
       100
        
       

     

       101
       101
       +
       func (n *posthogNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       102
       102
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       103
       +
       		DistinctId: pull.OwnerDid,

     

       104
       104
       +
       		Event:      "pull_closed",

     

       105
       105
       +
       		Properties: posthog.Properties{

     

       106
       106
       +
       			"repo_at": pull.RepoAt,

     

       107
       107
       +
       			"pull_id": pull.PullId,

     

       108
       108
       +
       		},

     

       109
       109
       +
       	})

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       112
       112
       +
       	}

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       101
       115
        
       func (n *posthogNotifier) NewFollow(ctx context.Context, follow *models.Follow) {

     

       102
       116
        
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       117
        
       		DistinctId: follow.UserDid,

     
···

       152
       166
        
       	}

     

       153
       167
        
       }

     

       154
       168
        
       

     

       155
       155
       -
       func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) {

     

       169
       169
       +
       func (n *posthogNotifier) NewString(ctx context.Context, string *models.String) {

     

       156
       170
        
       	err := n.client.Enqueue(posthog.Capture{

     

       157
       171
        
       		DistinctId: string.Did.String(),

     

       158
       158
       -
       		Event:      "create_string",

     

       172
       172
       +
       		Event:      "new_string",

     

       159
       173
        
       		Properties: posthog.Properties{"rkey": string.Rkey},

     

       160
       174
        
       	})

     

       161
       175
        
       	if err != nil {

     

       162
       176
        
       		log.Println("failed to enqueue posthog event:", err)

     

       163
       177
        
       	}

     

       164
       178
        
       }

     

       179
       179
       +
       

     

       180
       180
       +
       func (n *posthogNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment) {

     

       181
       181
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       182
       182
       +
       		DistinctId: comment.Did,

     

       183
       183
       +
       		Event:      "new_issue_comment",

     

       184
       184
       +
       		Properties: posthog.Properties{

     

       185
       185
       +
       			"issue_at": comment.IssueAt,

     

       186
       186
       +
       		},

     

       187
       187
       +
       	})

     

       188
       188
       +
       	if err != nil {

     

       189
       189
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       190
       190
       +
       	}

     

       191
       191
       +
       }

     

       192
       192
       +
       

     

       193
       193
       +
       func (n *posthogNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       194
       194
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       195
       195
       +
       		DistinctId: issue.Did,

     

       196
       196
       +
       		Event:      "issue_closed",

     

       197
       197
       +
       		Properties: posthog.Properties{

     

       198
       198
       +
       			"repo_at":  issue.RepoAt.String(),

     

       199
       199
       +
       			"issue_id": issue.IssueId,

     

       200
       200
       +
       		},

     

       201
       201
       +
       	})

     

       202
       202
       +
       	if err != nil {

     

       203
       203
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       204
       204
       +
       	}

     

       205
       205
       +
       }

     

       206
       206
       +
       

     

       207
       207
       +
       func (n *posthogNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       208
       208
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       209
       209
       +
       		DistinctId: pull.OwnerDid,

     

       210
       210
       +
       		Event:      "pull_merged",

     

       211
       211
       +
       		Properties: posthog.Properties{

     

       212
       212
       +
       			"repo_at": pull.RepoAt,

     

       213
       213
       +
       			"pull_id": pull.PullId,

     

       214
       214
       +
       		},

     

       215
       215
       +
       	})

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       218
       218
       +
       	}

     

       219
       219
       +
       }

+12

appview/notify/merged_notifier.go

···

       72
       72
        
       	}

     

       73
       73
        
       }

     

       74
       74
        
       

     

       75
       75
       +
       func (m *mergedNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       76
       76
       +
       	for _, notifier := range m.notifiers {

     

       77
       77
       +
       		notifier.NewPullMerged(ctx, pull)

     

       78
       78
       +
       	}

     

       79
       79
       +
       }

     

       80
       80
       +
       

     

       81
       81
       +
       func (m *mergedNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       82
       82
       +
       	for _, notifier := range m.notifiers {

     

       83
       83
       +
       		notifier.NewPullClosed(ctx, pull)

     

       84
       84
       +
       	}

     

       85
       85
       +
       }

     

       86
       86
       +
       

     

       75
       87
        
       func (m *mergedNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {

     

       76
       88
        
       	for _, notifier := range m.notifiers {

     

       77
       89
        
       		notifier.UpdateProfile(ctx, profile)

appview/notify/notifier.go

···

       21
       21
        
       

     

       22
       22
        
       	NewPull(ctx context.Context, pull *models.Pull)

     

       23
       23
        
       	NewPullComment(ctx context.Context, comment *models.PullComment)

     

       24
       24
       +
       	NewPullMerged(ctx context.Context, pull *models.Pull)

     

       25
       25
       +
       	NewPullClosed(ctx context.Context, pull *models.Pull)

     

       24
       26
        
       

     

       25
       27
        
       	UpdateProfile(ctx context.Context, profile *models.Profile)

     

       26
       28
        
       

     
···

       48
       50
        
       

     

       49
       51
        
       func (m *BaseNotifier) NewPull(ctx context.Context, pull *models.Pull)                 {}

     

       50
       52
        
       func (m *BaseNotifier) NewPullComment(ctx context.Context, models *models.PullComment) {}

     

       53
       53
       +
       func (m *BaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull)           {}

     

       54
       54
       +
       func (m *BaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull)           {}

     

       51
       55
        
       

     

       52
       56
        
       func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {}

     

       53
       57

+4 -11

appview/pages/templates/errors/500.html

···

       5
       5
        
           <div class="bg-white dark:bg-gray-800 rounded-lg drop-shadow-sm p-8 max-w-lg mx-auto">

     

       6
       6
        
               <div class="mb-6">

     

       7
       7
        
                   <div class="w-16 h-16 mx-auto mb-4 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">

     

       8
       8
       -
                       {{ i "alert-triangle" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       8
       8
       +
                       {{ i "triangle-alert" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       9
       9
        
                   </div>

     

       10
       10
        
               </div>

     

       11
       11
        
       

     
···

       14
       14
        
                       500 &mdash; internal server error

     

       15
       15
        
                   </h1>

     

       16
       16
        
                   <p class="text-gray-600 dark:text-gray-300">

     

       17
       17
       -
                       Something went wrong on our end. We've been notified and are working to fix the issue.

     

       18
       18
       -
                   </p>

     

       19
       19
       -
                   <div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded p-3 text-sm text-yellow-800 dark:text-yellow-200">

     

       20
       20
       -
                       <div class="flex items-center gap-2">

     

       21
       21
       -
                           {{ i "info" "w-4 h-4" }}

     

       22
       22
       -
                           <span class="font-medium">we're on it!</span>

     

       23
       23
       -
                       </div>

     

       24
       24
       -
                       <p class="mt-1">Our team has been automatically notified about this error.</p>

     

       25
       25
       -
                   </div>

     

       17
       17
       +
                       We encountered an error while processing your request. Please try again later.

     

       18
       18
       +
                    </p>

     

       26
       19
        
                   <div class="flex flex-col sm:flex-row gap-3 justify-center items-center mt-6">

     

       27
       20
        
                       <button onclick="location.reload()" class="btn-create gap-2">

     

       28
       21
        
                           {{ i "refresh-cw" "w-4 h-4" }}

     

       29
       22
        
                           try again

     

       30
       23
        
                       </button>

     

       31
       24
        
                       <a href="/" class="btn no-underline hover:no-underline gap-2">

     

       32
       32
       -
                           {{ i "home" "w-4 h-4" }}

     

       25
       25
       +
                           {{ i "arrow-left" "w-4 h-4" }}

     

       33
       26
        
                           back to home

     

       34
       27
        
                       </a>

     

       35
       28
        
                   </div>

+173

appview/pages/templates/user/settings/notifications.html

···

       1
       1
       +
       {{ define "title" }}{{ .Tab }} settings{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
         <div class="p-6">

     

       5
       5
       +
           <p class="text-xl font-bold dark:text-white">Settings</p>

     

       6
       6
       +
         </div>

     

       7
       7
       +
         <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       8
       8
       +
           <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6">

     

       9
       9
       +
             <div class="col-span-1">

     

       10
       10
       +
               {{ template "user/settings/fragments/sidebar" . }}

     

       11
       11
       +
             </div>

     

       12
       12
       +
             <div class="col-span-1 md:col-span-3 flex flex-col gap-6">

     

       13
       13
       +
               {{ template "notificationSettings" . }}

     

       14
       14
       +
             </div>

     

       15
       15
       +
           </section>

     

       16
       16
       +
         </div>

     

       17
       17
       +
       {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
       {{ define "notificationSettings" }}

     

       20
       20
       +
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center">

     

       21
       21
       +
           <div class="col-span-1 md:col-span-2">

     

       22
       22
       +
             <h2 class="text-sm pb-2 uppercase font-bold">Notification Preferences</h2>

     

       23
       23
       +
             <p class="text-gray-500 dark:text-gray-400">

     

       24
       24
       +
               Choose which notifications you want to receive when activity happens on your repositories and profile.

     

       25
       25
       +
             </p>

     

       26
       26
       +
           </div>

     

       27
       27
       +
         </div>

     

       28
       28
       +
       

     

       29
       29
       +
         <form hx-put="/settings/notifications" hx-swap="none" class="flex flex-col gap-6">

     

       30
       30
       +
       

     

       31
       31
       +
           <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full">

     

       32
       32
       +
             <div class="flex items-center justify-between p-2">

     

       33
       33
       +
               <div class="flex items-center gap-2">

     

       34
       34
       +
                 <div class="flex flex-col gap-1">

     

       35
       35
       +
                   <span class="font-bold">Repository starred</span>

     

       36
       36
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       37
       37
       +
                     <span>When someone stars your repository.</span>

     

       38
       38
       +
                   </div>

     

       39
       39
       +
                 </div>

     

       40
       40
       +
               </div>

     

       41
       41
       +
               <label class="flex items-center gap-2">

     

       42
       42
       +
                 <input type="checkbox" name="repo_starred" {{if .Preferences.RepoStarred}}checked{{end}}>

     

       43
       43
       +
               </label>

     

       44
       44
       +
             </div>

     

       45
       45
       +
       

     

       46
       46
       +
             <div class="flex items-center justify-between p-2">

     

       47
       47
       +
               <div class="flex items-center gap-2">

     

       48
       48
       +
                 <div class="flex flex-col gap-1">

     

       49
       49
       +
                   <span class="font-bold">New issues</span>

     

       50
       50
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       51
       51
       +
                     <span>When someone creates an issue on your repository.</span>

     

       52
       52
       +
                   </div>

     

       53
       53
       +
                 </div>

     

       54
       54
       +
               </div>

     

       55
       55
       +
               <label class="flex items-center gap-2">

     

       56
       56
       +
                 <input type="checkbox" name="issue_created" {{if .Preferences.IssueCreated}}checked{{end}}>

     

       57
       57
       +
               </label>

     

       58
       58
       +
             </div>

     

       59
       59
       +
       

     

       60
       60
       +
             <div class="flex items-center justify-between p-2">

     

       61
       61
       +
               <div class="flex items-center gap-2">

     

       62
       62
       +
                 <div class="flex flex-col gap-1">

     

       63
       63
       +
                   <span class="font-bold">Issue comments</span>

     

       64
       64
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       65
       65
       +
                     <span>When someone comments on an issue you're involved with.</span>

     

       66
       66
       +
                   </div>

     

       67
       67
       +
                 </div>

     

       68
       68
       +
               </div>

     

       69
       69
       +
               <label class="flex items-center gap-2">

     

       70
       70
       +
                 <input type="checkbox" name="issue_commented" {{if .Preferences.IssueCommented}}checked{{end}}>

     

       71
       71
       +
               </label>

     

       72
       72
       +
             </div>

     

       73
       73
       +
       

     

       74
       74
       +
             <div class="flex items-center justify-between p-2">

     

       75
       75
       +
               <div class="flex items-center gap-2">

     

       76
       76
       +
                 <div class="flex flex-col gap-1">

     

       77
       77
       +
                   <span class="font-bold">Issue closed</span>

     

       78
       78
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       79
       79
       +
                     <span>When an issue on your repository is closed.</span>

     

       80
       80
       +
                   </div>

     

       81
       81
       +
                 </div>

     

       82
       82
       +
               </div>

     

       83
       83
       +
               <label class="flex items-center gap-2">

     

       84
       84
       +
                 <input type="checkbox" name="issue_closed" {{if .Preferences.IssueClosed}}checked{{end}}>

     

       85
       85
       +
               </label>

     

       86
       86
       +
             </div>

     

       87
       87
       +
       

     

       88
       88
       +
             <div class="flex items-center justify-between p-2">

     

       89
       89
       +
               <div class="flex items-center gap-2">

     

       90
       90
       +
                 <div class="flex flex-col gap-1">

     

       91
       91
       +
                   <span class="font-bold">New pull requests</span>

     

       92
       92
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       93
       93
       +
                     <span>When someone creates a pull request on your repository.</span>

     

       94
       94
       +
                   </div>

     

       95
       95
       +
                 </div>

     

       96
       96
       +
               </div>

     

       97
       97
       +
               <label class="flex items-center gap-2">

     

       98
       98
       +
                 <input type="checkbox" name="pull_created" {{if .Preferences.PullCreated}}checked{{end}}>

     

       99
       99
       +
               </label>

     

       100
       100
       +
             </div>

     

       101
       101
       +
       

     

       102
       102
       +
             <div class="flex items-center justify-between p-2">

     

       103
       103
       +
               <div class="flex items-center gap-2">

     

       104
       104
       +
                 <div class="flex flex-col gap-1">

     

       105
       105
       +
                   <span class="font-bold">Pull request comments</span>

     

       106
       106
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       107
       107
       +
                     <span>When someone comments on a pull request you're involved with.</span>

     

       108
       108
       +
                   </div>

     

       109
       109
       +
                 </div>

     

       110
       110
       +
               </div>

     

       111
       111
       +
               <label class="flex items-center gap-2">

     

       112
       112
       +
                 <input type="checkbox" name="pull_commented" {{if .Preferences.PullCommented}}checked{{end}}>

     

       113
       113
       +
               </label>

     

       114
       114
       +
             </div>

     

       115
       115
       +
       

     

       116
       116
       +
             <div class="flex items-center justify-between p-2">

     

       117
       117
       +
               <div class="flex items-center gap-2">

     

       118
       118
       +
                 <div class="flex flex-col gap-1">

     

       119
       119
       +
                   <span class="font-bold">Pull request merged</span>

     

       120
       120
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       121
       121
       +
                     <span>When your pull request is merged.</span>

     

       122
       122
       +
                   </div>

     

       123
       123
       +
                 </div>

     

       124
       124
       +
               </div>

     

       125
       125
       +
               <label class="flex items-center gap-2">

     

       126
       126
       +
                 <input type="checkbox" name="pull_merged" {{if .Preferences.PullMerged}}checked{{end}}>

     

       127
       127
       +
               </label>

     

       128
       128
       +
             </div>

     

       129
       129
       +
       

     

       130
       130
       +
             <div class="flex items-center justify-between p-2">

     

       131
       131
       +
               <div class="flex items-center gap-2">

     

       132
       132
       +
                 <div class="flex flex-col gap-1">

     

       133
       133
       +
                   <span class="font-bold">New followers</span>

     

       134
       134
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       135
       135
       +
                     <span>When someone follows you.</span>

     

       136
       136
       +
                   </div>

     

       137
       137
       +
                 </div>

     

       138
       138
       +
               </div>

     

       139
       139
       +
               <label class="flex items-center gap-2">

     

       140
       140
       +
                 <input type="checkbox" name="followed" {{if .Preferences.Followed}}checked{{end}}>

     

       141
       141
       +
               </label>

     

       142
       142
       +
             </div>

     

       143
       143
       +
       

     

       144
       144
       +
             <div class="flex items-center justify-between p-2">

     

       145
       145
       +
               <div class="flex items-center gap-2">

     

       146
       146
       +
                 <div class="flex flex-col gap-1">

     

       147
       147
       +
                   <span class="font-bold">Email notifications</span>

     

       148
       148
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       149
       149
       +
                     <span>Receive notifications via email in addition to in-app notifications.</span>

     

       150
       150
       +
                   </div>

     

       151
       151
       +
                 </div>

     

       152
       152
       +
               </div>

     

       153
       153
       +
               <label class="flex items-center gap-2">

     

       154
       154
       +
                 <input type="checkbox" name="email_notifications" {{if .Preferences.EmailNotifications}}checked{{end}}>

     

       155
       155
       +
               </label>

     

       156
       156
       +
             </div>

     

       157
       157
       +
           </div>

     

       158
       158
       +
       

     

       159
       159
       +
           <div class="flex justify-end pt-2">

     

       160
       160
       +
             <button

     

       161
       161
       +
               type="submit"

     

       162
       162
       +
               class="btn-create flex items-center gap-2 group"

     

       163
       163
       +
             >

     

       164
       164
       +
               {{ i "save" "w-4 h-4" }}

     

       165
       165
       +
               save

     

       166
       166
       +
               {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       167
       167
       +
             </button>

     

       168
       168
       +
           </div>

     

       169
       169
       +
           <div id="settings-notifications-success"></div>

     

       170
       170
       +
       

     

       171
       171
       +
           <div id="settings-notifications-error" class="error"></div>

     

       172
       172
       +
         </form>

     

       173
       173
       +
       {{ end }}

+13 -4

appview/pages/templates/layouts/fragments/topbar.html

···

       2
       2
        
           <nav class="space-x-4 px-6 py-2 rounded-b bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
       4
        
                   <div id="left-items">

     

       5
       5
       -
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline">

     

       6
       6
       -
                       {{ template "fragments/logotypeSmall" }}

     

       5
       5
       +
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2">

     

       6
       6
       +
                       {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }}

     

       7
       7
       +
                       <span class="font-bold text-xl not-italic hidden md:inline">tangled</span>

     

       8
       8
       +
                       <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1 hidden md:inline">

     

       9
       9
       +
                         alpha

     

       10
       10
       +
                       </span>

     

       7
       11
        
                     </a>

     

       8
       12
        
                   </div>

     

       9
       13
        
       

     
···

       27
       31
        
       {{ define "newButton" }}

     

       28
       32
        
       <details class="relative inline-block text-left nav-dropdown">

     

       29
       33
        
           <summary class="btn-create py-0 cursor-pointer list-none flex items-center gap-2">

     

       30
       30
       -
             {{ i "plus" "w-4 h-4" }} new

     

       34
       34
       +
             {{ i "plus" "w-4 h-4" }} <span class="hidden md:inline">new</span>

     

       31
       35
        
           </summary>

     

       32
       36
        
           <div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700">

     

       33
       37
        
               <a href="/repo/new" class="flex items-center gap-2">

     
···

       48
       52
        
               class="cursor-pointer list-none flex items-center gap-1"

     

       49
       53
        
           >

     

       50
       54
        
               {{ $user := didOrHandle .Did .Handle }}

     

       51
       51
       -
               {{ template "user/fragments/picHandle" $user }}

     

       55
       55
       +
               <img

     

       56
       56
       +
                   src="{{ tinyAvatar $user }}"

     

       57
       57
       +
                   alt=""

     

       58
       58
       +
                   class="rounded-full h-6 w-6 border border-gray-300 dark:border-gray-700"

     

       59
       59
       +
               />

     

       60
       60
       +
               <span class="hidden md:inline">{{ $user | resolve | truncateAt30 }}</span>

     

       52
       61
        
           </summary>

     

       53
       62
        
           <div

     

       54
       63
        
               class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"

+2 -2

appview/pages/templates/strings/put.html

···

       3
       3
        
       {{ define "content" }}

     

       4
       4
        
         <div class="px-6 py-2 mb-4">

     

       5
       5
        
           {{ if eq .Action "new" }}

     

       6
       6
       -
             <p class="text-xl font-bold dark:text-white">Create a new string</p>

     

       7
       7
       -
             <p class="">Store and share code snippets with ease.</p>

     

       6
       6
       +
             <p class="text-xl font-bold dark:text-white mb-1">Create a new string</p>

     

       7
       7
       +
             <p class="text-gray-600 dark:text-gray-400 mb-1">Store and share code snippets with ease.</p>

     

       8
       8
        
           {{ else }}

     

       9
       9
        
             <p class="text-xl font-bold dark:text-white">Edit string</p>

     

       10
       10
        
           {{ end }}

-33

knotserver/git/git.go

···

       120
       120
        
       	return g.r.CommitObject(h)

     

       121
       121
        
       }

     

       122
       122
        
       

     

       123
       123
       -
       func (g *GitRepo) LastCommit() (*object.Commit, error) {

     

       124
       124
       -
       	c, err := g.r.CommitObject(g.h)

     

       125
       125
       -
       	if err != nil {

     

       126
       126
       -
       		return nil, fmt.Errorf("last commit: %w", err)

     

       127
       127
       -
       	}

     

       128
       128
       -
       	return c, nil

     

       129
       129
       -
       }

     

       130
       130
       -
       

     

       131
       123
        
       func (g *GitRepo) FileContentN(path string, cap int64) ([]byte, error) {

     

       132
       124
        
       	c, err := g.r.CommitObject(g.h)

     

       133
       125
        
       	if err != nil {

     
···

       162
       154
        
       	return buf.Bytes(), nil

     

       163
       155
        
       }

     

       164
       156
        
       

     

       165
       165
       -
       func (g *GitRepo) FileContent(path string) (string, error) {

     

       166
       166
       -
       	c, err := g.r.CommitObject(g.h)

     

       167
       167
       -
       	if err != nil {

     

       168
       168
       -
       		return "", fmt.Errorf("commit object: %w", err)

     

       169
       169
       -
       	}

     

       170
       170
       -
       

     

       171
       171
       -
       	tree, err := c.Tree()

     

       172
       172
       -
       	if err != nil {

     

       173
       173
       -
       		return "", fmt.Errorf("file tree: %w", err)

     

       174
       174
       -
       	}

     

       175
       175
       -
       

     

       176
       176
       -
       	file, err := tree.File(path)

     

       177
       177
       -
       	if err != nil {

     

       178
       178
       -
       		return "", err

     

       179
       179
       -
       	}

     

       180
       180
       -
       

     

       181
       181
       -
       	isbin, _ := file.IsBinary()

     

       182
       182
       -
       

     

       183
       183
       -
       	if !isbin {

     

       184
       184
       -
       		return file.Contents()

     

       185
       185
       -
       	} else {

     

       186
       186
       -
       		return "", ErrBinaryFile

     

       187
       187
       -
       	}

     

       188
       188
       -
       }

     

       189
       189
       -
       

     

       190
       157
        
       func (g *GitRepo) RawContent(path string) ([]byte, error) {

     

       191
       158
        
       	c, err := g.r.CommitObject(g.h)

     

       192
       159
        
       	if err != nil {

-4

knotserver/http_util.go

···

       16
       16
        
       	w.WriteHeader(status)

     

       17
       17
        
       	json.NewEncoder(w).Encode(map[string]string{"error": msg})

     

       18
       18
        
       }

     

       19
       19
       -
       

     

       20
       20
       -
       func notFound(w http.ResponseWriter) {

     

       21
       21
       -
       	writeError(w, "not found", http.StatusNotFound)

     

       22
       22
       -
       }

+1 -1

appview/ingester.go

···

       1008
       1008
        
       			if !ok {

     

       1009
       1009
        
       				return fmt.Errorf("failed to find label def for key: %s, expected: %q", o.OperandKey, slices.Collect(maps.Keys(actx.Defs)))

     

       1010
       1010
        
       			}

     

       1011
       1011
       -
       			if err := i.Validator.ValidateLabelOp(def, &o); err != nil {

     

       1011
       1011
       +
       			if err := i.Validator.ValidateLabelOp(def, repo, &o); err != nil {

     

       1012
       1012
        
       				return fmt.Errorf("failed to validate labelop: %w", err)

     

       1013
       1013
        
       			}

     

       1014
       1014
        
       		}

+4 -1

appview/validator/validator.go

···

       4
       4
        
       	"tangled.org/core/appview/db"

     

       5
       5
        
       	"tangled.org/core/appview/pages/markup"

     

       6
       6
        
       	"tangled.org/core/idresolver"

     

       7
       7
       +
       	"tangled.org/core/rbac"

     

       7
       8
        
       )

     

       8
       9
        
       

     

       9
       10
        
       type Validator struct {

     

       10
       11
        
       	db        *db.DB

     

       11
       12
        
       	sanitizer markup.Sanitizer

     

       12
       13
        
       	resolver  *idresolver.Resolver

     

       14
       14
       +
       	enforcer  *rbac.Enforcer

     

       13
       15
        
       }

     

       14
       16
        
       

     

       15
       15
       -
       func New(db *db.DB, res *idresolver.Resolver) *Validator {

     

       17
       17
       +
       func New(db *db.DB, res *idresolver.Resolver, enforcer *rbac.Enforcer) *Validator {

     

       16
       18
        
       	return &Validator{

     

       17
       19
        
       		db:        db,

     

       18
       20
        
       		sanitizer: markup.NewSanitizer(),

     

       19
       21
        
       		resolver:  res,

     

       22
       22
       +
       		enforcer:  enforcer,

     

       20
       23
        
       	}

     

       21
       24
        
       }

+5 -4

appview/models/label.go

···

       232
       232
        
       	}

     

       233
       233
        
       

     

       234
       234
        
       	var ops []LabelOp

     

       235
       235
       -
       	for _, o := range record.Add {

     

       235
       235
       +
       	// deletes first, then additions

     

       236
       236
       +
       	for _, o := range record.Delete {

     

       236
       237
        
       		if o != nil {

     

       237
       238
        
       			op := mkOp(o)

     

       238
       238
       -
       			op.Operation = LabelOperationAdd

     

       239
       239
       +
       			op.Operation = LabelOperationDel

     

       239
       240
        
       			ops = append(ops, op)

     

       240
       241
        
       		}

     

       241
       242
        
       	}

     

       242
       242
       -
       	for _, o := range record.Delete {

     

       243
       243
       +
       	for _, o := range record.Add {

     

       243
       244
        
       		if o != nil {

     

       244
       245
        
       			op := mkOp(o)

     

       245
       245
       -
       			op.Operation = LabelOperationDel

     

       246
       246
       +
       			op.Operation = LabelOperationAdd

     

       246
       247
        
       			ops = append(ops, op)

     

       247
       248
        
       		}

     

       248
       249
        
       	}

+1 -3

knotserver/git/tag.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"slices"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       	"strings"

     

       8
       7
        
       	"time"

     
···

       35
       34
        
       	outFormat.WriteString("")

     

       36
       35
        
       	outFormat.WriteString(recordSeparator)

     

       37
       36
        
       

     

       38
       38
       -
       	output, err := g.forEachRef(outFormat.String(), "refs/tags")

     

       37
       37
       +
       	output, err := g.forEachRef(outFormat.String(), "--sort=-creatordate", "refs/tags")

     

       39
       38
        
       	if err != nil {

     

       40
       39
        
       		return nil, fmt.Errorf("failed to get tags: %w", err)

     

       41
       40
        
       	}

     
···

       94
       93
        
       		tags = append(tags, tag)

     

       95
       94
        
       	}

     

       96
       95
        
       

     

       97
       97
       -
       	slices.Reverse(tags)

     

       98
       96
        
       	return tags, nil

     

       99
       97
        
       }

+1 -1

knotserver/xrpc/repo_blob.go

···

       44
       44
        
       

     

       45
       45
        
       	contents, err := gr.RawContent(treePath)

     

       46
       46
        
       	if err != nil {

     

       47
       47
       -
       		x.Logger.Error("file content", "error", err.Error())

     

       47
       47
       +
       		x.Logger.Error("file content", "error", err.Error(), "treePath", treePath)

     

       48
       48
        
       		writeError(w, xrpcerr.NewXrpcError(

     

       49
       49
        
       			xrpcerr.WithTag("FileNotFound"),

     

       50
       50
        
       			xrpcerr.WithMessage("file not found at the specified path"),

+10

api/tangled/repotree.go

···

       31
       31
        
       	Files  []*RepoTree_TreeEntry `json:"files" cborgen:"files"`

     

       32
       32
        
       	// parent: The parent path in the tree

     

       33
       33
        
       	Parent *string `json:"parent,omitempty" cborgen:"parent,omitempty"`

     

       34
       34
       +
       	// readme: Readme for this file tree

     

       35
       35
       +
       	Readme *RepoTree_Readme `json:"readme,omitempty" cborgen:"readme,omitempty"`

     

       34
       36
        
       	// ref: The git reference used

     

       35
       37
        
       	Ref string `json:"ref" cborgen:"ref"`

     

       36
       38
        
       }

     

       37
       39
        
       

     

       40
       40
       +
       // RepoTree_Readme is a "readme" in the sh.tangled.repo.tree schema.

     

       41
       41
       +
       type RepoTree_Readme struct {

     

       42
       42
       +
       	// contents: Contents of the readme file

     

       43
       43
       +
       	Contents string `json:"contents" cborgen:"contents"`

     

       44
       44
       +
       	// filename: Name of the readme file

     

       45
       45
       +
       	Filename string `json:"filename" cborgen:"filename"`

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       38
       48
        
       // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

     

       39
       49
        
       type RepoTree_TreeEntry struct {

     

       40
       50
        
       	// is_file: Whether this entry is a file

+15 -17

appview/pages/markup/format.go

···

       1
       1
        
       package markup

     

       2
       2
        
       

     

       3
       3
       -
       import "strings"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"regexp"

     

       5
       5
       +
       )

     

       4
       6
        
       

     

       5
       7
        
       type Format string

     

       6
       8
        
       

     
···

       10
       12
        
       )

     

       11
       13
        
       

     

       12
       14
        
       var FileTypes map[Format][]string = map[Format][]string{

     

       13
       13
       -
       	FormatMarkdown: []string{".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       15
       15
       +
       	FormatMarkdown: {".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       var FileTypePatterns = map[Format]*regexp.Regexp{

     

       19
       19
       +
       	FormatMarkdown: regexp.MustCompile(`(?i)\.(md|markdown|mdown|mkdn|mkd)$`),

     

       14
       20
        
       }

     

       15
       21
        
       

     

       16
       16
       -
       // ReadmeFilenames contains the list of common README filenames to search for,

     

       17
       17
       -
       // in order of preference. Only includes well-supported formats.

     

       18
       18
       -
       var ReadmeFilenames = []string{

     

       19
       19
       -
       	"README.md", "readme.md",

     

       20
       20
       -
       	"README",

     

       21
       21
       -
       	"readme",

     

       22
       22
       -
       	"README.markdown",

     

       23
       23
       -
       	"readme.markdown",

     

       24
       24
       -
       	"README.txt",

     

       25
       25
       -
       	"readme.txt",

     

       22
       22
       +
       var ReadmePattern = regexp.MustCompile(`(?i)^readme(\.(md|markdown|txt))?$`)

     

       23
       23
       +
       

     

       24
       24
       +
       func IsReadmeFile(filename string) bool {

     

       25
       25
       +
       	return ReadmePattern.MatchString(filename)

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       func GetFormat(filename string) Format {

     

       29
       29
       -
       	for format, extensions := range FileTypes {

     

       30
       30
       -
       		for _, extension := range extensions {

     

       31
       31
       -
       			if strings.HasSuffix(filename, extension) {

     

       32
       32
       -
       				return format

     

       33
       33
       -
       			}

     

       29
       29
       +
       	for format, pattern := range FileTypePatterns {

     

       30
       30
       +
       		if pattern.MatchString(filename) {

     

       31
       31
       +
       			return format

     

       34
       32
        
       		}

     

       35
       33
        
       	}

     

       36
       34
        
       	// default format

+2 -2

appview/pages/templates/repo/fragments/readme.html

···

       1
       1
        
       {{ define "repo/fragments/readme" }}

     

       2
       2
        
       <div class="mt-4 rounded bg-white dark:bg-gray-800 drop-shadow-sm w-full mx-auto overflow-hidden">

     

       3
       3
        
           {{- if .ReadmeFileName -}}

     

       4
       4
       -
           <div class="px-4 py-2 bg-gray-50 dark:bg-gray-700 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       4
       4
       +
           <div class="px-4 py-2 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       5
       5
        
               {{ i "file-text" "w-4 h-4" "text-gray-600 dark:text-gray-400" }}

     

       6
       6
        
               <span class="font-mono text-sm text-gray-800 dark:text-gray-200">{{ .ReadmeFileName }}</span>

     

       7
       7
        
           </div>

     

       8
       8
        
           {{- end -}}

     

       9
       9
        
           <section

     

       10
       10
       -
               class="p-6 overflow-auto {{ if not .Raw }}

     

       10
       10
       +
               class="px-6 pb-6 overflow-auto {{ if not .Raw }}

     

       11
       11
        
               prose dark:prose-invert dark:[&_pre]:bg-gray-900

     

       12
       12
        
               dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900

     

       13
       13
        
               dark:[&_pre]:border dark:[&_pre]:border-gray-700

+24

knotserver/xrpc/repo_tree.go

···

       4
       4
        
       	"net/http"

     

       5
       5
        
       	"path/filepath"

     

       6
       6
        
       	"time"

     

       7
       7
       +
       	"unicode/utf8"

     

       7
       8
        
       

     

       8
       9
        
       	"tangled.org/core/api/tangled"

     

       10
       10
       +
       	"tangled.org/core/appview/pages/markup"

     

       9
       11
        
       	"tangled.org/core/knotserver/git"

     

       10
       12
        
       	xrpcerr "tangled.org/core/xrpc/errors"

     

       11
       13
        
       )

     
···

       43
       45
        
       		return

     

       44
       46
        
       	}

     

       45
       47
        
       

     

       48
       48
       +
       	// if any of these files are a readme candidate, pass along its blob contents too

     

       49
       49
       +
       	var readmeFileName string

     

       50
       50
       +
       	var readmeContents string

     

       51
       51
       +
       	for _, file := range files {

     

       52
       52
       +
       		if markup.IsReadmeFile(file.Name) {

     

       53
       53
       +
       			contents, err := gr.RawContent(filepath.Join(path, file.Name))

     

       54
       54
       +
       			if err != nil {

     

       55
       55
       +
       				x.Logger.Error("failed to read contents of file", "path", path, "file", file.Name)

     

       56
       56
       +
       			}

     

       57
       57
       +
       

     

       58
       58
       +
       			if utf8.Valid(contents) {

     

       59
       59
       +
       				readmeFileName = file.Name

     

       60
       60
       +
       				readmeContents = string(contents)

     

       61
       61
       +
       				break

     

       62
       62
       +
       			}

     

       63
       63
       +
       		}

     

       64
       64
       +
       	}

     

       65
       65
       +
       

     

       46
       66
        
       	// convert NiceTree -> tangled.RepoTree_TreeEntry

     

       47
       67
        
       	treeEntries := make([]*tangled.RepoTree_TreeEntry, len(files))

     

       48
       68
        
       	for i, file := range files {

     
···

       83
       103
        
       		Parent: parentPtr,

     

       84
       104
        
       		Dotdot: dotdotPtr,

     

       85
       105
        
       		Files:  treeEntries,

     

       106
       106
       +
       		Readme: &tangled.RepoTree_Readme{

     

       107
       107
       +
       			Filename: readmeFileName,

     

       108
       108
       +
       			Contents: readmeContents,

     

       109
       109
       +
       		},

     

       86
       110
        
       	}

     

       87
       111
        
       

     

       88
       112
        
       	writeJson(w, response)

+19

lexicons/repo/tree.json

···

       41
       41
        
                     "type": "string",

     

       42
       42
        
                     "description": "Parent directory path"

     

       43
       43
        
                   },

     

       44
       44
       +
                   "readme": {

     

       45
       45
       +
                     "type": "ref",

     

       46
       46
       +
                     "ref": "#readme",

     

       47
       47
       +
                     "description": "Readme for this file tree"

     

       48
       48
       +
                   },

     

       44
       49
        
                   "files": {

     

       45
       50
        
                     "type": "array",

     

       46
       51
        
                     "items": {

     
···

       70
       75
        
               }

     

       71
       76
        
             ]

     

       72
       77
        
           },

     

       78
       78
       +
           "readme": {

     

       79
       79
       +
             "type": "object",

     

       80
       80
       +
             "required": ["filename", "contents"],

     

       81
       81
       +
             "properties": {

     

       82
       82
       +
               "filename": {

     

       83
       83
       +
                 "type": "string",

     

       84
       84
       +
                 "description": "Name of the readme file"

     

       85
       85
       +
               },

     

       86
       86
       +
               "contents": {

     

       87
       87
       +
                 "type": "string",

     

       88
       88
       +
                 "description": "Contents of the readme file"

     

       89
       89
       +
               }

     

       90
       90
       +
             }

     

       91
       91
       +
           },

     

       73
       92
        
           "treeEntry": {

     

       74
       93
        
             "type": "object",

     

       75
       94
        
             "required": ["name", "mode", "size", "is_file", "is_subtree"],

+7 -5

types/repo.go

···

       41
       41
        
       }

     

       42
       42
        
       

     

       43
       43
        
       type RepoTreeResponse struct {

     

       44
       44
       -
       	Ref         string     `json:"ref,omitempty"`

     

       45
       45
       -
       	Parent      string     `json:"parent,omitempty"`

     

       46
       46
       -
       	Description string     `json:"description,omitempty"`

     

       47
       47
       -
       	DotDot      string     `json:"dotdot,omitempty"`

     

       48
       48
       -
       	Files       []NiceTree `json:"files,omitempty"`

     

       44
       44
       +
       	Ref            string     `json:"ref,omitempty"`

     

       45
       45
       +
       	Parent         string     `json:"parent,omitempty"`

     

       46
       46
       +
       	Description    string     `json:"description,omitempty"`

     

       47
       47
       +
       	DotDot         string     `json:"dotdot,omitempty"`

     

       48
       48
       +
       	Files          []NiceTree `json:"files,omitempty"`

     

       49
       49
       +
       	ReadmeFileName string     `json:"readme_filename,omitempty"`

     

       50
       50
       +
       	Readme         string     `json:"readme_contents,omitempty"`

     

       49
       51
        
       }

     

       50
       52
        
       

     

       51
       53
        
       type TagReference struct {

+224

appview/pages/templates/brand/brand.html

···

       1
       1
       +
       {{ define "title" }}brand{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Brand</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           Assets and guidelines for using Tangled's logo and brand elements.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="space-y-16">

     

       14
       14
       +
       

     

       15
       15
       +
             <!-- Introduction Section -->

     

       16
       16
       +
             <section>

     

       17
       17
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       18
       18
       +
               Tangled's logo and mascot is <strong>Dolly</strong>, the first ever <em>cloned</em> mammal. Please

     

       19
       19
       +
               follow the below guidelines when using Dolly and the logotype.

     

       20
       20
       +
               </p>

     

       21
       21
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       22
       22
       +
               All assets are served as SVGs, and can be downloaded by right-clicking and clicking "Save image as".

     

       23
       23
       +
               </p>

     

       24
       24
       +
             </section>

     

       25
       25
       +
       

     

       26
       26
       +
             <!-- Black Logotype Section -->

     

       27
       27
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       28
       28
       +
               <div class="order-2 lg:order-1">

     

       29
       29
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       30
       30
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       31
       31
       +
                        alt="Tangled logo - black version"

     

       32
       32
       +
                        class="w-full max-w-sm mx-auto" />

     

       33
       33
       +
                 </div>

     

       34
       34
       +
               </div>

     

       35
       35
       +
               <div class="order-1 lg:order-2">

     

       36
       36
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Black logotype</h2>

     

       37
       37
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on light-colored backgrounds.</p>

     

       38
       38
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       39
       39
       +
                 This is the preferred version of the logotype, featuring dark text and elements, ideal for light

     

       40
       40
       +
                 backgrounds and designs.

     

       41
       41
       +
                 </p>

     

       42
       42
       +
               </div>

     

       43
       43
       +
             </section>

     

       44
       44
       +
       

     

       45
       45
       +
             <!-- White Logotype Section -->

     

       46
       46
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       47
       47
       +
               <div class="order-2 lg:order-1">

     

       48
       48
       +
                 <div class="bg-black p-8 sm:p-16 rounded">

     

       49
       49
       +
                   <img src="https://assets.tangled.network/tangled_logotype_white_on_trans.svg"

     

       50
       50
       +
                        alt="Tangled logo - white version"

     

       51
       51
       +
                        class="w-full max-w-sm mx-auto" />

     

       52
       52
       +
                 </div>

     

       53
       53
       +
               </div>

     

       54
       54
       +
               <div class="order-1 lg:order-2">

     

       55
       55
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">White logotype</h2>

     

       56
       56
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on dark-colored backgrounds.</p>

     

       57
       57
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       58
       58
       +
                   This version features white text and elements, ideal for dark backgrounds

     

       59
       59
       +
                   and inverted designs.

     

       60
       60
       +
                 </p>

     

       61
       61
       +
               </div>

     

       62
       62
       +
             </section>

     

       63
       63
       +
       

     

       64
       64
       +
             <!-- Mark Only Section -->

     

       65
       65
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       66
       66
       +
               <div class="order-2 lg:order-1">

     

       67
       67
       +
                 <div class="grid grid-cols-2 gap-2">

     

       68
       68
       +
                   <!-- Black mark on light background -->

     

       69
       69
       +
                   <div class="border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-100 p-8 sm:p-12 rounded">

     

       70
       70
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       71
       71
       +
                          alt="Dolly face - black version"

     

       72
       72
       +
                          class="w-full max-w-16 mx-auto" />

     

       73
       73
       +
                   </div>

     

       74
       74
       +
                   <!-- White mark on dark background -->

     

       75
       75
       +
                   <div class="bg-black p-8 sm:p-12 rounded">

     

       76
       76
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       77
       77
       +
                          alt="Dolly face - white version"

     

       78
       78
       +
                          class="w-full max-w-16 mx-auto" />

     

       79
       79
       +
                   </div>

     

       80
       80
       +
                 </div>

     

       81
       81
       +
               </div>

     

       82
       82
       +
               <div class="order-1 lg:order-2">

     

       83
       83
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Mark only</h2>

     

       84
       84
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       85
       85
       +
                   When a smaller 1:1 logo or icon is needed, Dolly's face may be used on its own.

     

       86
       86
       +
                 </p>

     

       87
       87
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       88
       88
       +
                   <strong class="font-semibold">Note</strong>: for situations where the background

     

       89
       89
       +
                   is unknown, use the black version for ideal contrast in most environments.

     

       90
       90
       +
                 </p>

     

       91
       91
       +
               </div>

     

       92
       92
       +
             </section>

     

       93
       93
       +
       

     

       94
       94
       +
             <!-- Colored Backgrounds Section -->

     

       95
       95
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       96
       96
       +
               <div class="order-2 lg:order-1">

     

       97
       97
       +
                 <div class="grid grid-cols-2 gap-2">

     

       98
       98
       +
                   <!-- Pastel Green background -->

     

       99
       99
       +
                   <div class="bg-green-500 p-8 sm:p-12 rounded">

     

       100
       100
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       101
       101
       +
                          alt="Tangled logo on pastel green background"

     

       102
       102
       +
                          class="w-full max-w-16 mx-auto" />

     

       103
       103
       +
                   </div>

     

       104
       104
       +
                   <!-- Pastel Blue background -->

     

       105
       105
       +
                   <div class="bg-blue-500 p-8 sm:p-12 rounded">

     

       106
       106
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       107
       107
       +
                          alt="Tangled logo on pastel blue background"

     

       108
       108
       +
                          class="w-full max-w-16 mx-auto" />

     

       109
       109
       +
                   </div>

     

       110
       110
       +
                   <!-- Pastel Yellow background -->

     

       111
       111
       +
                   <div class="bg-yellow-500 p-8 sm:p-12 rounded">

     

       112
       112
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       113
       113
       +
                          alt="Tangled logo on pastel yellow background"

     

       114
       114
       +
                          class="w-full max-w-16 mx-auto" />

     

       115
       115
       +
                   </div>

     

       116
       116
       +
                   <!-- Pastel Red background -->

     

       117
       117
       +
                   <div class="bg-red-500 p-8 sm:p-12 rounded">

     

       118
       118
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       119
       119
       +
                          alt="Tangled logo on pastel red background"

     

       120
       120
       +
                          class="w-full max-w-16 mx-auto" />

     

       121
       121
       +
                   </div>

     

       122
       122
       +
                 </div>

     

       123
       123
       +
               </div>

     

       124
       124
       +
               <div class="order-1 lg:order-2">

     

       125
       125
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Colored backgrounds</h2>

     

       126
       126
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       127
       127
       +
                   White logo mark on colored backgrounds.

     

       128
       128
       +
                 </p>

     

       129
       129
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       130
       130
       +
                   The white logo mark provides contrast on colored backgrounds.

     

       131
       131
       +
                   Perfect for more fun design contexts.

     

       132
       132
       +
                 </p>

     

       133
       133
       +
               </div>

     

       134
       134
       +
             </section>

     

       135
       135
       +
       

     

       136
       136
       +
             <!-- Black Logo on Pastel Backgrounds Section -->

     

       137
       137
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       138
       138
       +
               <div class="order-2 lg:order-1">

     

       139
       139
       +
                 <div class="grid grid-cols-2 gap-2">

     

       140
       140
       +
                   <!-- Pastel Green background -->

     

       141
       141
       +
                   <div class="bg-green-200 p-8 sm:p-12 rounded">

     

       142
       142
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       143
       143
       +
                          alt="Tangled logo on pastel green background"

     

       144
       144
       +
                          class="w-full max-w-16 mx-auto" />

     

       145
       145
       +
                   </div>

     

       146
       146
       +
                   <!-- Pastel Blue background -->

     

       147
       147
       +
                   <div class="bg-blue-200 p-8 sm:p-12 rounded">

     

       148
       148
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       149
       149
       +
                          alt="Tangled logo on pastel blue background"

     

       150
       150
       +
                          class="w-full max-w-16 mx-auto" />

     

       151
       151
       +
                   </div>

     

       152
       152
       +
                   <!-- Pastel Yellow background -->

     

       153
       153
       +
                   <div class="bg-yellow-200 p-8 sm:p-12 rounded">

     

       154
       154
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       155
       155
       +
                          alt="Tangled logo on pastel yellow background"

     

       156
       156
       +
                          class="w-full max-w-16 mx-auto" />

     

       157
       157
       +
                   </div>

     

       158
       158
       +
                   <!-- Pastel Pink background -->

     

       159
       159
       +
                   <div class="bg-pink-200 p-8 sm:p-12 rounded">

     

       160
       160
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       161
       161
       +
                          alt="Tangled logo on pastel pink background"

     

       162
       162
       +
                          class="w-full max-w-16 mx-auto" />

     

       163
       163
       +
                   </div>

     

       164
       164
       +
                 </div>

     

       165
       165
       +
               </div>

     

       166
       166
       +
               <div class="order-1 lg:order-2">

     

       167
       167
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Lighter backgrounds</h2>

     

       168
       168
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       169
       169
       +
                   Dark logo mark on lighter, pastel backgrounds.

     

       170
       170
       +
                 </p>

     

       171
       171
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       172
       172
       +
                   The dark logo mark works beautifully on pastel backgrounds,

     

       173
       173
       +
                   providing crisp contrast.

     

       174
       174
       +
                 </p>

     

       175
       175
       +
               </div>

     

       176
       176
       +
             </section>

     

       177
       177
       +
       

     

       178
       178
       +
             <!-- Recoloring Section -->

     

       179
       179
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       180
       180
       +
               <div class="order-2 lg:order-1">

     

       181
       181
       +
                 <div class="bg-yellow-100 border border-yellow-200 p-8 sm:p-16 rounded">

     

       182
       182
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       183
       183
       +
                        alt="Recolored Tangled logotype in gray/sand color"

     

       184
       184
       +
                        class="w-full max-w-sm mx-auto opacity-60 sepia contrast-75 saturate-50" />

     

       185
       185
       +
                 </div>

     

       186
       186
       +
               </div>

     

       187
       187
       +
               <div class="order-1 lg:order-2">

     

       188
       188
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Recoloring</h2>

     

       189
       189
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       190
       190
       +
                   Custom coloring of the logotype is permitted.

     

       191
       191
       +
                 </p>

     

       192
       192
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       193
       193
       +
                   Recoloring the logotype is allowed as long as readability is maintained.

     

       194
       194
       +
                 </p>

     

       195
       195
       +
                 <p class="text-gray-700 dark:text-gray-300 text-sm">

     

       196
       196
       +
                   <strong>Example:</strong> Gray/sand colored logotype on a light yellow/tan background.

     

       197
       197
       +
                 </p>

     

       198
       198
       +
               </div>

     

       199
       199
       +
             </section>

     

       200
       200
       +
       

     

       201
       201
       +
             <!-- Silhouette Section -->

     

       202
       202
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       203
       203
       +
               <div class="order-2 lg:order-1">

     

       204
       204
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       205
       205
       +
                   <img src="https://assets.tangled.network/tangled_dolly_silhouette.svg"

     

       206
       206
       +
                        alt="Dolly silhouette"

     

       207
       207
       +
                        class="w-full max-w-32 mx-auto" />

     

       208
       208
       +
                 </div>

     

       209
       209
       +
               </div>

     

       210
       210
       +
               <div class="order-1 lg:order-2">

     

       211
       211
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Dolly silhouette</h2>

     

       212
       212
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">A minimalist version of Dolly.</p>

     

       213
       213
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       214
       214
       +
                   The silhouette can be used where a subtle brand presence is needed,

     

       215
       215
       +
                   or as a background element. Works on any background color with proper contrast.

     

       216
       216
       +
                   For example, we use this as the site's favicon.

     

       217
       217
       +
                 </p>

     

       218
       218
       +
               </div>

     

       219
       219
       +
             </section>

     

       220
       220
       +
       

     

       221
       221
       +
           </div>

     

       222
       222
       +
         </main>

     

       223
       223
       +
       </div>

     

       224
       224
       +
       {{ end }}

+13 -6

appview/pages/templates/legal/privacy.html

···

       1
       1
        
       {{ define "title" }}privacy policy{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Privacy Policy</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
             Learn how we collect, use, and protect your personal information.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

+13 -6

appview/pages/templates/legal/terms.html

···

       1
       1
        
       {{ define "title" }}terms of service{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Terms of Service</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           A few things you should know.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

+4 -2

appview/config/config.go

···

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
        
       type Cloudflare struct {

     

       75
       75
       -
       	ApiToken string `env:"API_TOKEN"`

     

       76
       76
       -
       	ZoneId   string `env:"ZONE_ID"`

     

       75
       75
       +
       	ApiToken           string `env:"API_TOKEN"`

     

       76
       76
       +
       	ZoneId             string `env:"ZONE_ID"`

     

       77
       77
       +
       	TurnstileSiteKey   string `env:"TURNSTILE_SITE_KEY"`

     

       78
       78
       +
       	TurnstileSecretKey string `env:"TURNSTILE_SECRET_KEY"`

     

       77
       79
        
       }

     

       78
       80
        
       

     

       79
       81
        
       func (cfg RedisConfig) ToURL() string {

appview/pages/templates/repo/fork.html

···

       6
       6
        
       </div>

     

       7
       7
        
       <div class="p-6 bg-white dark:bg-gray-800 drop-shadow-sm rounded">

     

       8
       8
        
         <form hx-post="/{{ .RepoInfo.FullName }}/fork" class="space-y-12" hx-swap="none" hx-indicator="#spinner">

     

       9
       9
       +
       

     

       10
       10
       +
           <fieldset class="space-y-3">

     

       11
       11
       +
             <legend for="repo_name" class="dark:text-white">Repository name</legend>

     

       12
       12
       +
             <input type="text" id="repo_name" name="repo_name" value="{{ .RepoInfo.Name }}"

     

       13
       13
       +
               class="w-full p-2 border rounded bg-gray-100 dark:bg-gray-700 dark:text-white dark:border-gray-600" />

     

       14
       14
       +
           </fieldset>

     

       15
       15
       +
       

     

       9
       16
        
           <fieldset class="space-y-3">

     

       10
       17
        
             <legend class="dark:text-white">Select a knot to fork into</legend>

     

       11
       18
        
             <div class="space-y-2">

+11 -7

appview/repo/repo.go

···

       2129
       2129
        
       		}

     

       2130
       2130
        
       

     

       2131
       2131
        
       		// choose a name for a fork

     

       2132
       2132
       -
       		forkName := f.Name

     

       2132
       2132
       +
       		forkName := r.FormValue("repo_name")

     

       2133
       2133
       +
       		if forkName == "" {

     

       2134
       2134
       +
       			rp.pages.Notice(w, "repo", "Repository name cannot be empty.")

     

       2135
       2135
       +
       			return

     

       2136
       2136
       +
       		}

     

       2137
       2137
       +
       

     

       2133
       2138
        
       		// this check is *only* to see if the forked repo name already exists

     

       2134
       2139
        
       		// in the user's account.

     

       2135
       2140
        
       		existingRepo, err := db.GetRepo(

     

       2136
       2141
        
       			rp.db,

     

       2137
       2142
        
       			db.FilterEq("did", user.Did),

     

       2138
       2138
       -
       			db.FilterEq("name", f.Name),

     

       2143
       2143
       +
       			db.FilterEq("name", forkName),

     

       2139
       2144
        
       		)

     

       2140
       2145
        
       		if err != nil {

     

       2141
       2141
       -
       			if errors.Is(err, sql.ErrNoRows) {

     

       2142
       2142
       -
       				// no existing repo with this name found, we can use the name as is

     

       2143
       2143
       -
       			} else {

     

       2146
       2146
       +
       			if !errors.Is(err, sql.ErrNoRows) {

     

       2144
       2147
        
       				log.Println("error fetching existing repo from db", "err", err)

     

       2145
       2148
        
       				rp.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.")

     

       2146
       2149
        
       				return

     

       2147
       2150
        
       			}

     

       2148
       2151
        
       		} else if existingRepo != nil {

     

       2149
       2149
       -
       			// repo with this name already exists, append random string

     

       2150
       2150
       -
       			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))

     

       2152
       2152
       +
       			// repo with this name already exists

     

       2153
       2153
       +
       			rp.pages.Notice(w, "repo", "A repository with this name already exists.")

     

       2154
       2154
       +
       			return

     

       2151
       2155
        
       		}

     

       2152
       2156
        
       		l = l.With("forkName", forkName)

     

       2153
       2157

+140

appview/db/db.go

···

       954
       954
        
       		return err

     

       955
       955
        
       	})

     

       956
       956
        
       

     

       957
       957
       +
       	// add generated at_uri column to pulls table

     

       958
       958
       +
       	//

     

       959
       959
       +
       	// this requires a full table recreation because stored columns

     

       960
       960
       +
       	// cannot be added via alter

     

       961
       961
       +
       	//

     

       962
       962
       +
       	// disable foreign-keys for the next migration

     

       963
       963
       +
       	conn.ExecContext(ctx, "pragma foreign_keys = off;")

     

       964
       964
       +
       	runMigration(conn, "add-at-uri-to-pulls", func(tx *sql.Tx) error {

     

       965
       965
       +
       		_, err := tx.Exec(`

     

       966
       966
       +
       		create table if not exists pulls_new (

     

       967
       967
       +
       			-- identifiers

     

       968
       968
       +
       			id integer primary key autoincrement,

     

       969
       969
       +
       			pull_id integer not null,

     

       970
       970
       +
       			at_uri text generated always as ('at://' || owner_did || '/' || 'sh.tangled.repo.pull' || '/' || rkey) stored,

     

       971
       971
       +
       

     

       972
       972
       +
       			-- at identifiers

     

       973
       973
       +
       			repo_at text not null,

     

       974
       974
       +
       			owner_did text not null,

     

       975
       975
       +
       			rkey text not null,

     

       976
       976
       +
       

     

       977
       977
       +
       			-- content

     

       978
       978
       +
       			title text not null,

     

       979
       979
       +
       			body text not null,

     

       980
       980
       +
       			target_branch text not null,

     

       981
       981
       +
       			state integer not null default 0 check (state in (0, 1, 2, 3)), -- closed, open, merged, deleted

     

       982
       982
       +
       

     

       983
       983
       +
       			-- source info

     

       984
       984
       +
       			source_branch text,

     

       985
       985
       +
       			source_repo_at text,

     

       986
       986
       +
       

     

       987
       987
       +
       			-- stacking

     

       988
       988
       +
       			stack_id text,

     

       989
       989
       +
       			change_id text,

     

       990
       990
       +
       			parent_change_id text,

     

       991
       991
       +
       

     

       992
       992
       +
       			-- meta

     

       993
       993
       +
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       994
       994
       +
       

     

       995
       995
       +
       			-- constraints

     

       996
       996
       +
       			unique(repo_at, pull_id),

     

       997
       997
       +
       			unique(at_uri),

     

       998
       998
       +
       			foreign key (repo_at) references repos(at_uri) on delete cascade

     

       999
       999
       +
       		);

     

       1000
       1000
       +
       		`)

     

       1001
       1001
       +
       		if err != nil {

     

       1002
       1002
       +
       			return err

     

       1003
       1003
       +
       		}

     

       1004
       1004
       +
       

     

       1005
       1005
       +
       		// transfer data

     

       1006
       1006
       +
       		_, err = tx.Exec(`

     

       1007
       1007
       +
       		insert into pulls_new (

     

       1008
       1008
       +
       			id, pull_id, repo_at, owner_did, rkey,

     

       1009
       1009
       +
       			title, body, target_branch, state,

     

       1010
       1010
       +
       			source_branch, source_repo_at,

     

       1011
       1011
       +
       			stack_id, change_id, parent_change_id,

     

       1012
       1012
       +
       			created

     

       1013
       1013
       +
       		)

     

       1014
       1014
       +
       		select

     

       1015
       1015
       +
       			id, pull_id, repo_at, owner_did, rkey,

     

       1016
       1016
       +
       			title, body, target_branch, state,

     

       1017
       1017
       +
       			source_branch, source_repo_at,

     

       1018
       1018
       +
       			stack_id, change_id, parent_change_id,

     

       1019
       1019
       +
       			created

     

       1020
       1020
       +
       			from pulls;

     

       1021
       1021
       +
       		`)

     

       1022
       1022
       +
       		if err != nil {

     

       1023
       1023
       +
       			return err

     

       1024
       1024
       +
       		}

     

       1025
       1025
       +
       

     

       1026
       1026
       +
       		// drop old table

     

       1027
       1027
       +
       		_, err = tx.Exec(`drop table pulls`)

     

       1028
       1028
       +
       		if err != nil {

     

       1029
       1029
       +
       			return err

     

       1030
       1030
       +
       		}

     

       1031
       1031
       +
       

     

       1032
       1032
       +
       		// rename new table

     

       1033
       1033
       +
       		_, err = tx.Exec(`alter table pulls_new rename to pulls`)

     

       1034
       1034
       +
       		return err

     

       1035
       1035
       +
       	})

     

       1036
       1036
       +
       	conn.ExecContext(ctx, "pragma foreign_keys = on;")

     

       1037
       1037
       +
       

     

       1038
       1038
       +
       	// remove repo_at and pull_id from pull_submissions and replace with pull_at

     

       1039
       1039
       +
       	//

     

       1040
       1040
       +
       	// this requires a full table recreation because stored columns

     

       1041
       1041
       +
       	// cannot be added via alter

     

       1042
       1042
       +
       	//

     

       1043
       1043
       +
       	// disable foreign-keys for the next migration

     

       1044
       1044
       +
       	conn.ExecContext(ctx, "pragma foreign_keys = off;")

     

       1045
       1045
       +
       	runMigration(conn, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error {

     

       1046
       1046
       +
       		_, err := tx.Exec(`

     

       1047
       1047
       +
       		create table if not exists pull_submissions_new (

     

       1048
       1048
       +
       			-- identifiers

     

       1049
       1049
       +
       			id integer primary key autoincrement,

     

       1050
       1050
       +
       			pull_at text not null,

     

       1051
       1051
       +
       

     

       1052
       1052
       +
       			-- content, these are immutable, and require a resubmission to update

     

       1053
       1053
       +
       			round_number integer not null default 0,

     

       1054
       1054
       +
       			patch text,

     

       1055
       1055
       +
       			source_rev text,

     

       1056
       1056
       +
       

     

       1057
       1057
       +
       			-- meta

     

       1058
       1058
       +
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       1059
       1059
       +
       

     

       1060
       1060
       +
       			-- constraints

     

       1061
       1061
       +
       			unique(pull_at, round_number),

     

       1062
       1062
       +
       			foreign key (pull_at) references pulls(at_uri) on delete cascade

     

       1063
       1063
       +
       		);

     

       1064
       1064
       +
       		`)

     

       1065
       1065
       +
       		if err != nil {

     

       1066
       1066
       +
       			return err

     

       1067
       1067
       +
       		}

     

       1068
       1068
       +
       

     

       1069
       1069
       +
       		// transfer data, constructing pull_at from pulls table

     

       1070
       1070
       +
       		_, err = tx.Exec(`

     

       1071
       1071
       +
       		insert into pull_submissions_new (id, pull_at, round_number, patch, created)

     

       1072
       1072
       +
       		select 

     

       1073
       1073
       +
       			ps.id,

     

       1074
       1074
       +
       			'at://' || p.owner_did || '/sh.tangled.repo.pull/' || p.rkey,

     

       1075
       1075
       +
       			ps.round_number,

     

       1076
       1076
       +
       			ps.patch,

     

       1077
       1077
       +
       			ps.created

     

       1078
       1078
       +
       		from pull_submissions ps

     

       1079
       1079
       +
       		join pulls p on ps.repo_at = p.repo_at and ps.pull_id = p.pull_id;

     

       1080
       1080
       +
       		`)

     

       1081
       1081
       +
       		if err != nil {

     

       1082
       1082
       +
       			return err

     

       1083
       1083
       +
       		}

     

       1084
       1084
       +
       

     

       1085
       1085
       +
       		// drop old table

     

       1086
       1086
       +
       		_, err = tx.Exec(`drop table pull_submissions`)

     

       1087
       1087
       +
       		if err != nil {

     

       1088
       1088
       +
       			return err

     

       1089
       1089
       +
       		}

     

       1090
       1090
       +
       

     

       1091
       1091
       +
       		// rename new table

     

       1092
       1092
       +
       		_, err = tx.Exec(`alter table pull_submissions_new rename to pull_submissions`)

     

       1093
       1093
       +
       		return err

     

       1094
       1094
       +
       	})

     

       1095
       1095
       +
       	conn.ExecContext(ctx, "pragma foreign_keys = on;")

     

       1096
       1096
       +
       

     

       957
       1097
        
       	return &DB{db}, nil

     

       958
       1098
        
       }

     

       959
       1099

+44 -1

appview/models/pull.go

···

       77
       77
        
       	PullSource *PullSource

     

       78
       78
        
       

     

       79
       79
        
       	// optionally, populate this when querying for reverse mappings

     

       80
       80
       -
       	Repo *Repo

     

       80
       80
       +
       	Labels LabelState

     

       81
       81
       +
       	Repo   *Repo

     

       81
       82
        
       }

     

       82
       83
        
       

     

       83
       84
        
       func (p Pull) AsRecord() tangled.RepoPull {

     
···

       206
       207
        
       	return p.StackId != ""

     

       207
       208
        
       }

     

       208
       209
        
       

     

       210
       210
       +
       func (p *Pull) Participants() []string {

     

       211
       211
       +
       	participantSet := make(map[string]struct{})

     

       212
       212
       +
       	participants := []string{}

     

       213
       213
       +
       

     

       214
       214
       +
       	addParticipant := func(did string) {

     

       215
       215
       +
       		if _, exists := participantSet[did]; !exists {

     

       216
       216
       +
       			participantSet[did] = struct{}{}

     

       217
       217
       +
       			participants = append(participants, did)

     

       218
       218
       +
       		}

     

       219
       219
       +
       	}

     

       220
       220
       +
       

     

       221
       221
       +
       	addParticipant(p.OwnerDid)

     

       222
       222
       +
       

     

       223
       223
       +
       	for _, s := range p.Submissions {

     

       224
       224
       +
       		for _, sp := range s.Participants() {

     

       225
       225
       +
       			addParticipant(sp)

     

       226
       226
       +
       		}

     

       227
       227
       +
       	}

     

       228
       228
       +
       

     

       229
       229
       +
       	return participants

     

       230
       230
       +
       }

     

       231
       231
       +
       

     

       209
       232
        
       func (s PullSubmission) IsFormatPatch() bool {

     

       210
       233
        
       	return patchutil.IsFormatPatch(s.Patch)

     

       211
       234
        
       }

     
···

       220
       243
        
       	return patches

     

       221
       244
        
       }

     

       222
       245
        
       

     

       246
       246
       +
       func (s *PullSubmission) Participants() []string {

     

       247
       247
       +
       	participantSet := make(map[string]struct{})

     

       248
       248
       +
       	participants := []string{}

     

       249
       249
       +
       

     

       250
       250
       +
       	addParticipant := func(did string) {

     

       251
       251
       +
       		if _, exists := participantSet[did]; !exists {

     

       252
       252
       +
       			participantSet[did] = struct{}{}

     

       253
       253
       +
       			participants = append(participants, did)

     

       254
       254
       +
       		}

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	addParticipant(s.PullAt.Authority().String())

     

       258
       258
       +
       

     

       259
       259
       +
       	for _, c := range s.Comments {

     

       260
       260
       +
       		addParticipant(c.OwnerDid)

     

       261
       261
       +
       	}

     

       262
       262
       +
       

     

       263
       263
       +
       	return participants

     

       264
       264
       +
       }

     

       265
       265
       +
       

     

       223
       266
        
       type Stack []*Pull

     

       224
       267
        
       

     

       225
       268
        
       // position of this pull in the stack

+26

appview/pages/templates/repo/fragments/participants.html

···

       1
       1
       +
       {{ define "repo/fragments/participants" }}

     

       2
       2
       +
         {{ $all := . }}

     

       3
       3
       +
         {{ $ps := take $all 5 }}

     

       4
       4
       +
         <div class="px-6 md:px-0">

     

       5
       5
       +
           <div class="py-1 flex items-center text-sm">

     

       6
       6
       +
             <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span>

     

       7
       7
       +
             <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span>

     

       8
       8
       +
           </div>

     

       9
       9
       +
           <div class="flex items-center -space-x-3 mt-2">

     

       10
       10
       +
             {{ $c := "z-50 z-40 z-30 z-20 z-10" }}

     

       11
       11
       +
             {{ range $i, $p := $ps }}

     

       12
       12
       +
               <img

     

       13
       13
       +
                   src="{{ tinyAvatar . }}"

     

       14
       14
       +
                   alt=""

     

       15
       15
       +
                   class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0"

     

       16
       16
       +
               />

     

       17
       17
       +
             {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
             {{ if gt (len $all) 5 }}

     

       20
       20
       +
               <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm">

     

       21
       21
       +
                 +{{ sub (len $all) 5 }}

     

       22
       22
       +
               </span>

     

       23
       23
       +
             {{ end }}

     

       24
       24
       +
           </div>

     

       25
       25
       +
         </div>

     

       26
       26
       +
       {{ end }}

+30 -12

appview/pages/templates/repo/pulls/pull.html

···

       9
       9
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}

     

       10
       10
        
       {{ end }}

     

       11
       11
        
       

     

       12
       12
       +
       {{ define "repoContentLayout" }}

     

       13
       13
       +
         <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full">

     

       14
       14
       +
           <div class="col-span-1 md:col-span-8">

     

       15
       15
       +
             <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white">

     

       16
       16
       +
               {{ block "repoContent" . }}{{ end }}

     

       17
       17
       +
             </section>

     

       18
       18
       +
             {{ block "repoAfter" . }}{{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
           <div class="col-span-1 md:col-span-2 flex flex-col gap-6">

     

       21
       21
       +
             {{ template "repo/fragments/labelPanel"

     

       22
       22
       +
               (dict "RepoInfo" $.RepoInfo

     

       23
       23
       +
                     "Defs" $.LabelDefs

     

       24
       24
       +
                     "Subject" $.Pull.PullAt

     

       25
       25
       +
                     "State" $.Pull.Labels) }}

     

       26
       26
       +
             {{ template "repo/fragments/participants" $.Pull.Participants }}

     

       27
       27
       +
           </div>

     

       28
       28
       +
         </div>

     

       29
       29
       +
       {{ end }}

     

       12
       30
        
       

     

       13
       31
        
       {{ define "repoContent" }}

     

       14
       32
        
         {{ template "repo/pulls/fragments/pullHeader" . }}

     
···

       39
       57
        
           {{ with $item }}

     

       40
       58
        
           <details {{ if eq $idx $lastIdx }}open{{ end }}>

     

       41
       59
        
               <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer">

     

       42
       42
       -
                 <div class="flex flex-wrap gap-2 items-center">

     

       60
       60
       +
                 <div class="flex flex-wrap gap-2 items-stretch">

     

       43
       61
        
                   <!-- round number -->

     

       44
       62
        
                   <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white">

     

       45
       63
        
                     <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span>

     

       46
       64
        
                   </div>

     

       47
       65
        
                   <!-- round summary -->

     

       48
       48
       -
                   <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       66
       66
       +
                   <div class="flex-1 rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       49
       67
        
                     <span class="gap-1 flex items-center">

     

       50
       68
        
                       {{ $owner := resolve $.Pull.OwnerDid }}

     

       51
       69
        
                       {{ $re := "re" }}

     
···

       72
       90
        
                     <span class="hidden md:inline">diff</span>

     

       73
       91
        
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       74
       92
        
                   </a>

     

       75
       75
       -
                   {{ if not (eq .RoundNumber 0) }}

     

       76
       76
       -
                   <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       77
       77
       -
                      hx-boost="true"

     

       78
       78
       -
                      href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       79
       79
       -
                     {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       80
       80
       -
                     <span class="hidden md:inline">interdiff</span>

     

       81
       81
       -
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       82
       82
       -
                   </a>

     

       83
       83
       -
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       93
       93
       +
                   {{ if ne $idx 0 }}

     

       94
       94
       +
                     <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       95
       95
       +
                        hx-boost="true"

     

       96
       96
       +
                        href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       97
       97
       +
                       {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       98
       98
       +
                       <span class="hidden md:inline">interdiff</span>

     

       99
       99
       +
                       {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       100
       100
       +
                     </a>

     

       84
       101
        
                   {{ end }}

     

       102
       102
       +
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       85
       103
        
                 </div>

     

       86
       104
        
               </summary>

     

       87
       105
        
       

     
···

       146
       164
        
       

     

       147
       165
        
               <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative">

     

       148
       166
        
                 {{ range $cidx, $c := .Comments }}

     

       149
       149
       -
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       167
       167
       +
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full">

     

       150
       168
        
                     {{ if gt $cidx 0 }}

     

       151
       169
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       152
       170
        
                     {{ end }}

appview/pages/templates/repo/pulls/pulls.html

···

       108
       108
        
                             <span class="before:content-['·']"></span>

     

       109
       109
        
                             {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }}

     

       110
       110
        
                           {{ end }}

     

       111
       111
       +
       

     

       112
       112
       +
                           {{ $state := .Labels }}

     

       113
       113
       +
                           {{ range $k, $d := $.LabelDefs }}

     

       114
       114
       +
                             {{ range $v, $s := $state.GetValSet $d.AtUri.String }}

     

       115
       115
       +
                               {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}

     

       116
       116
       +
                             {{ end }}

     

       117
       117
       +
                           {{ end }}

     

       111
       118
        
                       </div>

     

       112
       119
        
                     </div>

     

       113
       120
        
                     {{ if .StackId }}

+8 -48

appview/notify/db/db.go

···

       30
       30
        
       

     

       31
       31
        
       func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) {

     

       32
       32
        
       	var err error

     

       33
       33
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(star.RepoAt)))

     

       33
       33
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt)))

     

       34
       34
        
       	if err != nil {

     

       35
       35
        
       		log.Printf("NewStar: failed to get repos: %v", err)

     

       36
       36
        
       		return

     

       37
       37
        
       	}

     

       38
       38
       -
       	if len(repos) == 0 {

     

       39
       39
       -
       		log.Printf("NewStar: no repo found for %s", star.RepoAt)

     

       40
       40
       -
       		return

     

       41
       41
       -
       	}

     

       42
       42
       -
       	repo := repos[0]

     

       43
       38
        
       

     

       44
       39
        
       	// don't notify yourself

     

       45
       40
        
       	if repo.Did == star.StarredByDid {

     
···

       76
       71
        
       }

     

       77
       72
        
       

     

       78
       73
        
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue) {

     

       79
       79
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       74
       74
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       80
       75
        
       	if err != nil {

     

       81
       76
        
       		log.Printf("NewIssue: failed to get repos: %v", err)

     

       82
       77
        
       		return

     

       83
       78
        
       	}

     

       84
       84
       -
       	if len(repos) == 0 {

     

       85
       85
       -
       		log.Printf("NewIssue: no repo found for %s", issue.RepoAt)

     

       86
       86
       -
       		return

     

       87
       87
       -
       	}

     

       88
       88
       -
       	repo := repos[0]

     

       89
       79
        
       

     

       90
       80
        
       	if repo.Did == issue.Did {

     

       91
       81
        
       		return

     
···

       129
       119
        
       	}

     

       130
       120
        
       	issue := issues[0]

     

       131
       121
        
       

     

       132
       132
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       122
       122
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       133
       123
        
       	if err != nil {

     

       134
       124
        
       		log.Printf("NewIssueComment: failed to get repos: %v", err)

     

       135
       125
        
       		return

     

       136
       126
        
       	}

     

       137
       137
       -
       	if len(repos) == 0 {

     

       138
       138
       -
       		log.Printf("NewIssueComment: no repo found for %s", issue.RepoAt)

     

       139
       139
       -
       		return

     

       140
       140
       -
       	}

     

       141
       141
       -
       	repo := repos[0]

     

       142
       127
        
       

     

       143
       128
        
       	recipients := make(map[string]bool)

     

       144
       129
        
       

     
···

       211
       196
        
       }

     

       212
       197
        
       

     

       213
       198
        
       func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) {

     

       214
       214
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       199
       199
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       215
       200
        
       	if err != nil {

     

       216
       201
        
       		log.Printf("NewPull: failed to get repos: %v", err)

     

       217
       202
        
       		return

     

       218
       203
        
       	}

     

       219
       219
       -
       	if len(repos) == 0 {

     

       220
       220
       -
       		log.Printf("NewPull: no repo found for %s", pull.RepoAt)

     

       221
       221
       -
       		return

     

       222
       222
       -
       	}

     

       223
       223
       -
       	repo := repos[0]

     

       224
       204
        
       

     

       225
       205
        
       	if repo.Did == pull.OwnerDid {

     

       226
       206
        
       		return

     
···

       266
       246
        
       	}

     

       267
       247
        
       	pull := pulls[0]

     

       268
       248
        
       

     

       269
       269
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", comment.RepoAt))

     

       249
       249
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt))

     

       270
       250
        
       	if err != nil {

     

       271
       251
        
       		log.Printf("NewPullComment: failed to get repos: %v", err)

     

       272
       252
        
       		return

     

       273
       253
        
       	}

     

       274
       274
       -
       	if len(repos) == 0 {

     

       275
       275
       -
       		log.Printf("NewPullComment: no repo found for %s", comment.RepoAt)

     

       276
       276
       -
       		return

     

       277
       277
       -
       	}

     

       278
       278
       -
       	repo := repos[0]

     

       279
       254
        
       

     

       280
       255
        
       	recipients := make(map[string]bool)

     

       281
       256
        
       

     
···

       335
       310
        
       

     

       336
       311
        
       func (n *databaseNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       337
       312
        
       	// Get repo details

     

       338
       338
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       313
       313
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       339
       314
        
       	if err != nil {

     

       340
       315
        
       		log.Printf("NewIssueClosed: failed to get repos: %v", err)

     

       341
       316
        
       		return

     

       342
       317
        
       	}

     

       343
       343
       -
       	if len(repos) == 0 {

     

       344
       344
       -
       		log.Printf("NewIssueClosed: no repo found for %s", issue.RepoAt)

     

       345
       345
       -
       		return

     

       346
       346
       -
       	}

     

       347
       347
       -
       	repo := repos[0]

     

       348
       318
        
       

     

       349
       319
        
       	// Don't notify yourself

     

       350
       320
        
       	if repo.Did == issue.Did {

     
···

       380
       350
        
       

     

       381
       351
        
       func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       382
       352
        
       	// Get repo details

     

       383
       383
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       353
       353
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       384
       354
        
       	if err != nil {

     

       385
       355
        
       		log.Printf("NewPullMerged: failed to get repos: %v", err)

     

       386
       356
        
       		return

     

       387
       357
        
       	}

     

       388
       388
       -
       	if len(repos) == 0 {

     

       389
       389
       -
       		log.Printf("NewPullMerged: no repo found for %s", pull.RepoAt)

     

       390
       390
       -
       		return

     

       391
       391
       -
       	}

     

       392
       392
       -
       	repo := repos[0]

     

       393
       358
        
       

     

       394
       359
        
       	// Don't notify yourself

     

       395
       360
        
       	if repo.Did == pull.OwnerDid {

     
···

       425
       390
        
       

     

       426
       391
        
       func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       427
       392
        
       	// Get repo details

     

       428
       428
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       393
       393
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       429
       394
        
       	if err != nil {

     

       430
       395
        
       		log.Printf("NewPullClosed: failed to get repos: %v", err)

     

       431
       396
        
       		return

     

       432
       397
        
       	}

     

       433
       433
       -
       	if len(repos) == 0 {

     

       434
       434
       -
       		log.Printf("NewPullClosed: no repo found for %s", pull.RepoAt)

     

       435
       435
       -
       		return

     

       436
       436
       -
       	}

     

       437
       437
       -
       	repo := repos[0]

     

       438
       398
        
       

     

       439
       399
        
       	// Don't notify yourself

     

       440
       400
        
       	if repo.Did == pull.OwnerDid {

+18 -13

appview/db/notifications.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"database/sql"

     

       6
       6
       +
       	"errors"

     

       6
       7
        
       	"fmt"

     

       8
       8
       +
       	"strings"

     

       7
       9
        
       	"time"

     

       8
       10
        
       

     

       9
       11
        
       	"tangled.org/core/appview/models"

     
···

       248
       250
        
       	return GetNotificationsPaginated(e, pagination.FirstPage(), filters...)

     

       249
       251
        
       }

     

       250
       252
        
       

     

       251
       251
       -
       func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) {

     

       252
       252
       -
       	recipientFilter := FilterEq("recipient_did", userDID)

     

       253
       253
       -
       	readFilter := FilterEq("read", 0)

     

       253
       253
       +
       func CountNotifications(e Execer, filters ...filter) (int64, error) {

     

       254
       254
       +
       	var conditions []string

     

       255
       255
       +
       	var args []any

     

       256
       256
       +
       	for _, filter := range filters {

     

       257
       257
       +
       		conditions = append(conditions, filter.Condition())

     

       258
       258
       +
       		args = append(args, filter.Arg()...)

     

       259
       259
       +
       	}

     

       254
       260
        
       

     

       255
       255
       -
       	query := fmt.Sprintf(`

     

       256
       256
       -
       		SELECT COUNT(*)

     

       257
       257
       -
       		FROM notifications

     

       258
       258
       -
       		WHERE %s AND %s

     

       259
       259
       -
       	`, recipientFilter.Condition(), readFilter.Condition())

     

       261
       261
       +
       	whereClause := ""

     

       262
       262
       +
       	if conditions != nil {

     

       263
       263
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       264
       264
       +
       	}

     

       260
       265
        
       

     

       261
       261
       -
       	args := append(recipientFilter.Arg(), readFilter.Arg()...)

     

       266
       266
       +
       	query := fmt.Sprintf(`select count(1) from notifications %s`, whereClause)

     

       267
       267
       +
       	var count int64

     

       268
       268
       +
       	err := e.QueryRow(query, args...).Scan(&count)

     

       262
       269
        
       

     

       263
       263
       -
       	var count int

     

       264
       264
       -
       	err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count)

     

       265
       265
       -
       	if err != nil {

     

       266
       266
       -
       		return 0, fmt.Errorf("failed to get unread count: %w", err)

     

       270
       270
       +
       	if !errors.Is(err, sql.ErrNoRows) && err != nil {

     

       271
       271
       +
       		return 0, err

     

       267
       272
        
       	}

     

       268
       273
        
       

     

       269
       274
        
       	return count, nil

+29 -36

appview/notifications/notifications.go

···

       1
       1
        
       package notifications

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       4
       5
        
       	"log"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       	"strconv"

     
···

       32
       33
        
       

     

       33
       34
        
       	r.Use(middleware.AuthMiddleware(n.oauth))

     

       34
       35
        
       

     

       35
       35
       -
       	r.Get("/", n.notificationsPage)

     

       36
       36
       +
       	r.With(middleware.Paginate).Get("/", n.notificationsPage)

     

       36
       37
        
       

     

       37
       38
        
       	r.Get("/count", n.getUnreadCount)

     

       38
       39
        
       	r.Post("/{id}/read", n.markRead)

     
···

       45
       46
        
       func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) {

     

       46
       47
        
       	userDid := n.oauth.GetDid(r)

     

       47
       48
        
       

     

       48
       48
       -
       	limitStr := r.URL.Query().Get("limit")

     

       49
       49
       -
       	offsetStr := r.URL.Query().Get("offset")

     

       50
       50
       -
       

     

       51
       51
       -
       	limit := 20 // default

     

       52
       52
       -
       	if limitStr != "" {

     

       53
       53
       -
       		if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 {

     

       54
       54
       -
       			limit = l

     

       55
       55
       -
       		}

     

       49
       49
       +
       	page, ok := r.Context().Value("page").(pagination.Page)

     

       50
       50
       +
       	if !ok {

     

       51
       51
       +
       		log.Println("failed to get page")

     

       52
       52
       +
       		page = pagination.FirstPage()

     

       56
       53
        
       	}

     

       57
       54
        
       

     

       58
       58
       -
       	offset := 0 // default

     

       59
       59
       -
       	if offsetStr != "" {

     

       60
       60
       -
       		if o, err := strconv.Atoi(offsetStr); err == nil && o >= 0 {

     

       61
       61
       -
       			offset = o

     

       62
       62
       -
       		}

     

       55
       55
       +
       	total, err := db.CountNotifications(

     

       56
       56
       +
       		n.db,

     

       57
       57
       +
       		db.FilterEq("recipient_did", userDid),

     

       58
       58
       +
       	)

     

       59
       59
       +
       	if err != nil {

     

       60
       60
       +
       		log.Println("failed to get total notifications:", err)

     

       61
       61
       +
       		n.pages.Error500(w)

     

       62
       62
       +
       		return

     

       63
       63
        
       	}

     

       64
       64
        
       

     

       65
       65
       -
       	page := pagination.Page{Limit: limit + 1, Offset: offset}

     

       66
       66
       -
       	notifications, err := db.GetNotificationsWithEntities(n.db, page, db.FilterEq("recipient_did", userDid))

     

       65
       65
       +
       	notifications, err := db.GetNotificationsWithEntities(

     

       66
       66
       +
       		n.db,

     

       67
       67
       +
       		page,

     

       68
       68
       +
       		db.FilterEq("recipient_did", userDid),

     

       69
       69
       +
       	)

     

       67
       70
        
       	if err != nil {

     

       68
       71
        
       		log.Println("failed to get notifications:", err)

     

       69
       72
        
       		n.pages.Error500(w)

     

       70
       73
        
       		return

     

       71
       74
        
       	}

     

       72
       75
        
       

     

       73
       73
       -
       	hasMore := len(notifications) > limit

     

       74
       74
       -
       	if hasMore {

     

       75
       75
       -
       		notifications = notifications[:limit]

     

       76
       76
       -
       	}

     

       77
       77
       -
       

     

       78
       76
        
       	err = n.db.MarkAllNotificationsRead(r.Context(), userDid)

     

       79
       77
        
       	if err != nil {

     

       80
       78
        
       		log.Println("failed to mark notifications as read:", err)

     
···

       88
       86
        
       		return

     

       89
       87
        
       	}

     

       90
       88
        
       

     

       91
       91
       -
       	params := pages.NotificationsParams{

     

       89
       89
       +
       	fmt.Println(n.pages.Notifications(w, pages.NotificationsParams{

     

       92
       90
        
       		LoggedInUser:  user,

     

       93
       91
        
       		Notifications: notifications,

     

       94
       92
        
       		UnreadCount:   unreadCount,

     

       95
       95
       -
       		HasMore:       hasMore,

     

       96
       96
       -
       		NextOffset:    offset + limit,

     

       97
       97
       -
       		Limit:         limit,

     

       98
       98
       -
       	}

     

       99
       99
       -
       

     

       100
       100
       -
       	err = n.pages.Notifications(w, params)

     

       101
       101
       -
       	if err != nil {

     

       102
       102
       -
       		log.Println("failed to load notifs:", err)

     

       103
       103
       -
       		n.pages.Error500(w)

     

       104
       104
       -
       		return

     

       105
       105
       -
       	}

     

       93
       93
       +
       		Page:          page,

     

       94
       94
       +
       		Total:         total,

     

       95
       95
       +
       	}))

     

       106
       96
        
       }

     

       107
       97
        
       

     

       108
       98
        
       func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) {

     

       109
       109
       -
       	userDid := n.oauth.GetDid(r)

     

       110
       110
       -
       

     

       111
       111
       -
       	count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid)

     

       99
       99
       +
       	user := n.oauth.GetUser(r)

     

       100
       100
       +
       	count, err := db.CountNotifications(

     

       101
       101
       +
       		n.db,

     

       102
       102
       +
       		db.FilterEq("recipient_did", user.Did),

     

       103
       103
       +
       		db.FilterEq("read", 0),

     

       104
       104
       +
       	)

     

       112
       105
        
       	if err != nil {

     

       113
       106
        
       		http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

     

       114
       107
        
       		return

+48 -15

appview/pages/templates/notifications/list.html

···

       11
       11
        
           </div>

     

       12
       12
        
         </div>

     

       13
       13
        
       

     

       14
       14
       -
           {{if .Notifications}}

     

       15
       15
       -
             <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       -
               {{range .Notifications}}

     

       17
       17
       -
                 {{template "notifications/fragments/item" .}}

     

       18
       18
       -
               {{end}}

     

       19
       19
       -
             </div>

     

       14
       14
       +
         {{if .Notifications}}

     

       15
       15
       +
           <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       +
             {{range .Notifications}}

     

       17
       17
       +
               {{template "notifications/fragments/item" .}}

     

       18
       18
       +
             {{end}}

     

       19
       19
       +
           </div>

     

       20
       20
        
       

     

       21
       21
       -
           {{else}}

     

       22
       22
       -
             <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       -
               <div class="text-center py-12">

     

       24
       24
       -
                 <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       -
                   {{ i "bell-off" "w-16 h-16" }}

     

       26
       26
       -
                 </div>

     

       27
       27
       -
                 <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       -
                 <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       21
       21
       +
         {{else}}

     

       22
       22
       +
           <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       +
             <div class="text-center py-12">

     

       24
       24
       +
               <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       +
                 {{ i "bell-off" "w-16 h-16" }}

     

       29
       26
        
               </div>

     

       27
       27
       +
               <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       +
               <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       30
       29
        
             </div>

     

       31
       31
       -
           {{end}}

     

       30
       30
       +
           </div>

     

       31
       31
       +
         {{end}}

     

       32
       32
       +
       

     

       33
       33
       +
         {{ template "pagination" . }}

     

       34
       34
       +
       {{ end }}

     

       35
       35
       +
       

     

       36
       36
       +
       {{ define "pagination" }}

     

       37
       37
       +
         <div class="flex justify-end mt-4 gap-2">

     

       38
       38
       +
             {{ if gt .Page.Offset 0 }}

     

       39
       39
       +
                {{ $prev := .Page.Previous }}

     

       40
       40
       +
                 <a

     

       41
       41
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       42
       42
       +
                     hx-boost="true"

     

       43
       43
       +
                     href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       44
       44
       +
                 >

     

       45
       45
       +
                     {{ i "chevron-left" "w-4 h-4" }}

     

       46
       46
       +
                     previous

     

       47
       47
       +
                 </a>

     

       48
       48
       +
             {{ else }}

     

       49
       49
       +
                 <div></div>

     

       50
       50
       +
             {{ end }}

     

       51
       51
       +
       

     

       52
       52
       +
             {{ $next := .Page.Next }}

     

       53
       53
       +
             {{ if lt $next.Offset .Total }}

     

       54
       54
       +
                {{ $next := .Page.Next }}

     

       55
       55
       +
                 <a

     

       56
       56
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       57
       57
       +
                     hx-boost="true"

     

       58
       58
       +
                     href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       59
       59
       +
                 >

     

       60
       60
       +
                     next

     

       61
       61
       +
                     {{ i "chevron-right" "w-4 h-4" }}

     

       62
       62
       +
                 </a>

     

       63
       63
       +
             {{ end }}

     

       64
       64
       +
         </div>

     

       32
       65
        
       {{ end }}

+1 -1

appview/pagination/page.go

···

       8
       8
        
       func FirstPage() Page {

     

       9
       9
        
       	return Page{

     

       10
       10
        
       		Offset: 0,

     

       11
       11
       -
       		Limit:  10,

     

       11
       11
       +
       		Limit:  30,

     

       12
       12
        
       	}

     

       13
       13
        
       }

     

       14
       14

+27 -208

appview/pages/templates/notifications/fragments/item.html

···

       1
       1
        
       {{define "notifications/fragments/item"}}

     

       2
       2
       -
         <div 

     

       3
       3
       -
           class="

     

       4
       4
       -
             w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 

     

       5
       5
       -
             {{if not .Read}}bg-blue-50 dark:bg-blue-900/20 border border-blue-500 dark:border-sky-800{{end}}

     

       6
       6
       -
             flex gap-2 items-center

     

       7
       7
       -
             "

     

       8
       8
       -
           >

     

       2
       2
       +
         <a href="{{ template "notificationUrl" . }}" class="block no-underline hover:no-underline">

     

       3
       3
       +
           <div 

     

       4
       4
       +
             class="

     

       5
       5
       +
               w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 

     

       6
       6
       +
               {{if not .Read}}bg-blue-50 dark:bg-blue-800/20 border border-blue-500 dark:border-sky-800{{end}}

     

       7
       7
       +
               flex gap-2 items-center

     

       8
       8
       +
               ">

     

       9
       9
       +
             {{ template "notificationIcon" . }}

     

       10
       10
       +
             <div class="flex-1 w-full flex flex-col gap-1">

     

       11
       11
       +
               <span>{{ template "notificationHeader" . }}</span>

     

       12
       12
       +
               <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span>

     

       13
       13
       +
             </div>

     

       9
       14
        
       

     

       10
       10
       -
           {{ template "notificationIcon" . }}

     

       11
       11
       -
           <div class="flex-1 w-full flex flex-col gap-1">

     

       12
       12
       -
             <span>{{ template "notificationHeader" . }}</span>

     

       13
       13
       -
             <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span>

     

       14
       15
        
           </div>

     

       15
       15
       -
       

     

       16
       16
       -
         </div>

     

       16
       16
       +
         </a>

     

       17
       17
        
       {{end}}

     

       18
       18
        
       

     

       19
       19
        
       {{ define "notificationIcon" }}

     
···

       64
       64
        
         {{ end }}

     

       65
       65
        
       {{ end }}

     

       66
       66
        
       

     

       67
       67
       -
       {{define "issueNotification"}}

     

       68
       68
       -
       {{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}}

     

       69
       69
       -
       <a

     

       70
       70
       -
         href="{{$url}}"

     

       71
       71
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       72
       72
       -
       >

     

       73
       73
       -
         <div class="flex items-center justify-between">

     

       74
       74
       -
           <div class="min-w-0 flex-1">

     

       75
       75
       -
             <!-- First line: icon + actor action -->

     

       76
       76
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       77
       77
       -
               {{if eq .Type "issue_created"}}

     

       78
       78
       -
                 <span class="text-green-600 dark:text-green-500">

     

       79
       79
       -
                   {{ i "circle-dot" "w-4 h-4" }}

     

       80
       80
       -
                 </span>

     

       81
       81
       -
               {{else if eq .Type "issue_commented"}}

     

       82
       82
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       83
       83
       -
                   {{ i "message-circle" "w-4 h-4" }}

     

       84
       84
       -
                 </span>

     

       85
       85
       -
               {{else if eq .Type "issue_closed"}}

     

       86
       86
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       87
       87
       -
                   {{ i "ban" "w-4 h-4" }}

     

       88
       88
       -
                 </span>

     

       89
       89
       -
               {{end}}

     

       90
       90
       -
               {{template "user/fragments/picHandle" .ActorDid}}

     

       91
       91
       -
               {{if eq .Type "issue_created"}}

     

       92
       92
       -
                 <span class="text-gray-500 dark:text-gray-400">opened issue</span>

     

       93
       93
       -
               {{else if eq .Type "issue_commented"}}

     

       94
       94
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on issue</span>

     

       95
       95
       -
               {{else if eq .Type "issue_closed"}}

     

       96
       96
       -
                 <span class="text-gray-500 dark:text-gray-400">closed issue</span>

     

       97
       97
       -
               {{end}}

     

       98
       98
       -
               {{if not .Read}}

     

       99
       99
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       100
       100
       -
               {{end}}

     

       101
       101
       -
             </div>

     

       102
       102
       -
       

     

       103
       103
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

       104
       104
       -
               <span class="text-gray-500 dark:text-gray-400">#{{.Issue.IssueId}}</span>

     

       105
       105
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Issue.Title}}</span>

     

       106
       106
       -
               <span>on</span>

     

       107
       107
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       108
       108
       -
             </div>

     

       109
       109
       -
           </div>

     

       110
       110
       -
       

     

       111
       111
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       112
       112
       -
             {{ template "repo/fragments/time" .Created }}

     

       113
       113
       -
           </div>

     

       114
       114
       -
         </div>

     

       115
       115
       -
       </a>

     

       116
       116
       -
       {{end}}

     

       117
       117
       -
       

     

       118
       118
       -
       {{define "pullNotification"}}

     

       119
       119
       -
       {{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}}

     

       120
       120
       -
       <a

     

       121
       121
       -
         href="{{$url}}"

     

       122
       122
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       123
       123
       -
       >

     

       124
       124
       -
         <div class="flex items-center justify-between">

     

       125
       125
       -
           <div class="min-w-0 flex-1">

     

       126
       126
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       127
       127
       -
               {{if eq .Type "pull_created"}}

     

       128
       128
       -
                 <span class="text-green-600 dark:text-green-500">

     

       129
       129
       -
                   {{ i "git-pull-request-create" "w-4 h-4" }}

     

       130
       130
       -
                 </span>

     

       131
       131
       -
               {{else if eq .Type "pull_commented"}}

     

       132
       132
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       133
       133
       -
                   {{ i "message-circle" "w-4 h-4" }}

     

       134
       134
       -
                 </span>

     

       135
       135
       -
               {{else if eq .Type "pull_merged"}}

     

       136
       136
       -
                 <span class="text-purple-600 dark:text-purple-500">

     

       137
       137
       -
                   {{ i "git-merge" "w-4 h-4" }}

     

       138
       138
       -
                 </span>

     

       139
       139
       -
               {{else if eq .Type "pull_closed"}}

     

       140
       140
       -
                 <span class="text-red-600 dark:text-red-500">

     

       141
       141
       -
                   {{ i "git-pull-request-closed" "w-4 h-4" }}

     

       142
       142
       -
                 </span>

     

       143
       143
       -
               {{end}}

     

       144
       144
       -
               {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       145
       145
       -
               {{if eq .Type "pull_created"}}

     

       146
       146
       -
                 <span class="text-gray-500 dark:text-gray-400">opened pull request</span>

     

       147
       147
       -
               {{else if eq .Type "pull_commented"}}

     

       148
       148
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on pull request</span>

     

       149
       149
       -
               {{else if eq .Type "pull_merged"}}

     

       150
       150
       -
                 <span class="text-gray-500 dark:text-gray-400">merged pull request</span>

     

       151
       151
       -
               {{else if eq .Type "pull_closed"}}

     

       152
       152
       -
                 <span class="text-gray-500 dark:text-gray-400">closed pull request</span>

     

       153
       153
       -
               {{end}}

     

       154
       154
       -
               {{if not .Read}}

     

       155
       155
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       156
       156
       -
               {{end}}

     

       157
       157
       -
             </div>

     

       158
       158
       -
       

     

       159
       159
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

       160
       160
       -
               <span class="text-gray-500 dark:text-gray-400">#{{.Pull.PullId}}</span>

     

       161
       161
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Pull.Title}}</span>

     

       162
       162
       -
               <span>on</span>

     

       163
       163
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       164
       164
       -
             </div>

     

       165
       165
       -
           </div>

     

       166
       166
       -
       

     

       167
       167
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       168
       168
       -
             {{ template "repo/fragments/time" .Created }}

     

       169
       169
       -
           </div>

     

       170
       170
       -
         </div>

     

       171
       171
       -
       </a>

     

       172
       172
       -
       {{end}}

     

       173
       173
       -
       

     

       174
       174
       -
       {{define "repoNotification"}}

     

       175
       175
       -
       {{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}}

     

       176
       176
       -
       <a

     

       177
       177
       -
         href="{{$url}}"

     

       178
       178
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       179
       179
       -
       >

     

       180
       180
       -
         <div class="flex items-center justify-between">

     

       181
       181
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       182
       182
       -
             <span class="text-yellow-500 dark:text-yellow-400">

     

       183
       183
       -
               {{ i "star" "w-4 h-4" }}

     

       184
       184
       -
             </span>

     

       185
       185
       -
       

     

       186
       186
       -
             <div class="min-w-0 flex-1">

     

       187
       187
       -
               <!-- Single line for stars: actor action subject -->

     

       188
       188
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       189
       189
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       190
       190
       -
                 <span class="text-gray-500 dark:text-gray-400">starred</span>

     

       191
       191
       -
                 <span class="font-medium">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       192
       192
       -
                 {{if not .Read}}

     

       193
       193
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       194
       194
       -
                 {{end}}

     

       195
       195
       -
               </div>

     

       196
       196
       -
             </div>

     

       197
       197
       -
           </div>

     

       198
       198
       -
       

     

       199
       199
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       200
       200
       -
             {{ template "repo/fragments/time" .Created }}

     

       201
       201
       -
           </div>

     

       202
       202
       -
         </div>

     

       203
       203
       -
       </a>

     

       204
       204
       -
       {{end}}

     

       205
       205
       -
       

     

       206
       206
       -
       {{define "followNotification"}}

     

       207
       207
       -
       {{$url := printf "/%s" (resolve .ActorDid)}}

     

       208
       208
       -
       <a

     

       209
       209
       -
         href="{{$url}}"

     

       210
       210
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       211
       211
       -
       >

     

       212
       212
       -
         <div class="flex items-center justify-between">

     

       213
       213
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       214
       214
       -
             <span class="text-blue-600 dark:text-blue-400">

     

       215
       215
       -
               {{ i "user-plus" "w-4 h-4" }}

     

       216
       216
       -
             </span>

     

       217
       217
       -
       

     

       218
       218
       -
             <div class="min-w-0 flex-1">

     

       219
       219
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       220
       220
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       221
       221
       -
                 <span class="text-gray-500 dark:text-gray-400">followed you</span>

     

       222
       222
       -
                 {{if not .Read}}

     

       223
       223
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       224
       224
       -
                 {{end}}

     

       225
       225
       -
               </div>

     

       226
       226
       -
             </div>

     

       227
       227
       -
           </div>

     

       228
       228
       -
       

     

       229
       229
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       230
       230
       -
             {{ template "repo/fragments/time" .Created }}

     

       231
       231
       -
           </div>

     

       232
       232
       -
         </div>

     

       233
       233
       -
       </a>

     

       234
       234
       -
       {{end}}

     

       235
       235
       -
       

     

       236
       236
       -
       {{define "genericNotification"}}

     

       237
       237
       -
       <a

     

       238
       238
       -
         href="#"

     

       239
       239
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       240
       240
       -
       >

     

       241
       241
       -
         <div class="flex items-center justify-between">

     

       242
       242
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       243
       243
       -
             <span class="{{if not .Read}}text-blue-600 dark:text-blue-400{{else}}text-gray-500 dark:text-gray-400{{end}}">

     

       244
       244
       -
               {{ i "bell" "w-4 h-4" }}

     

       245
       245
       -
             </span>

     

       246
       246
       -
       

     

       247
       247
       -
             <div class="min-w-0 flex-1">

     

       248
       248
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       249
       249
       -
                 <span>New notification</span>

     

       250
       250
       -
                 {{if not .Read}}

     

       251
       251
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       252
       252
       -
                 {{end}}

     

       253
       253
       -
               </div>

     

       254
       254
       -
             </div>

     

       255
       255
       -
           </div>

     

       67
       67
       +
       {{ define "notificationUrl" }}

     

       68
       68
       +
         {{ $url := "" }}

     

       69
       69
       +
         {{ if eq .Type "repo_starred" }}

     

       70
       70
       +
           {{$url = printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}}

     

       71
       71
       +
         {{ else if .Issue }}

     

       72
       72
       +
           {{$url = printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}}

     

       73
       73
       +
         {{ else if .Pull }}

     

       74
       74
       +
           {{$url = printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}}

     

       75
       75
       +
         {{ else if eq .Type "followed" }}

     

       76
       76
       +
           {{$url = printf "/%s" (resolve .ActorDid)}}

     

       77
       77
       +
         {{ else }}

     

       78
       78
       +
         {{ end }}

     

       256
       79
        
       

     

       257
       257
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       258
       258
       -
             {{ template "repo/fragments/time" .Created }}

     

       259
       259
       -
           </div>

     

       260
       260
       -
         </div>

     

       261
       261
       -
       </a>

     

       262
       262
       -
       {{end}}

     

       80
       80
       +
         {{ $url }}

     

       81
       81
       +
       {{ end }}

+1 -1

nix/pkgs/knot-unwrapped.nix

···

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
        
       }: let

     

       7
       7
       -
         version = "1.9.0-alpha";

     

       7
       7
       +
         version = "1.9.1-alpha";

     

       8
       8
        
       in

     

       9
       9
        
         buildGoApplication {

     

       10
       10
        
           pname = "knot";

+2 -2

appview/db/pulls.go

···

       246
       246
        
       	// collect pull source for all pulls that need it

     

       247
       247
        
       	var sourceAts []syntax.ATURI

     

       248
       248
        
       	for _, p := range pulls {

     

       249
       249
       -
       		if p.PullSource.RepoAt != nil {

     

       249
       249
       +
       		if p.PullSource != nil && p.PullSource.RepoAt != nil {

     

       250
       250
        
       			sourceAts = append(sourceAts, *p.PullSource.RepoAt)

     

       251
       251
        
       		}

     

       252
       252
        
       	}

     
···

       259
       259
        
       		sourceRepoMap[r.RepoAt()] = &r

     

       260
       260
        
       	}

     

       261
       261
        
       	for _, p := range pulls {

     

       262
       262
       -
       		if p.PullSource.RepoAt != nil {

     

       262
       262
       +
       		if p.PullSource != nil && p.PullSource.RepoAt != nil {

     

       263
       263
        
       			if sourceRepo, ok := sourceRepoMap[*p.PullSource.RepoAt]; ok {

     

       264
       264
        
       				p.PullSource.Repo = sourceRepo

     

       265
       265
        
       			}

+1 -1

appview/pages/templates/repo/fragments/cloneDropdown.html

···

       1
       1
        
       {{ define "repo/fragments/cloneDropdown" }}

     

       2
       2
        
           {{ $knot := .RepoInfo.Knot }}

     

       3
       3
        
           {{ if eq $knot "knot1.tangled.sh" }}

     

       4
       4
       -
               {{ $knot = "tangled.sh" }}

     

       4
       4
       +
               {{ $knot = "tangled.org" }}

     

       5
       5
        
           {{ end }}

     

       6
       6
        
       

     

       7
       7
        
           <details id="clone-dropdown" class="relative inline-block text-left group">

+1 -1

docs/spindle/pipeline.md

···

       21
       21
        
         - `manual`: The workflow can be triggered manually.

     

       22
       22
        
       - `branch`: This is a **required** field that defines which branches the workflow should run for. If used with the `push` event, commits to the branch(es) listed here will trigger the workflow. If used with the `pull_request` event, updates to pull requests targeting the branch(es) listed here will trigger the workflow. This field has no effect with the `manual` event.

     

       23
       23
        
       

     

       24
       24
       -
       For example, if you'd like define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with:

     

       24
       24
       +
       For example, if you'd like to define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with:

     

       25
       25
        
       

     

       26
       26
        
       ```yaml

     

       27
       27
        
       when:

+1 -1

knotserver/config/config.go

···

       41
       41
        
       	Repo            Repo   `env:",prefix=KNOT_REPO_"`

     

       42
       42
        
       	Server          Server `env:",prefix=KNOT_SERVER_"`

     

       43
       43
        
       	Git             Git    `env:",prefix=KNOT_GIT_"`

     

       44
       44
       -
       	AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.sh"`

     

       44
       44
       +
       	AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.org"`

     

       45
       45
        
       }

     

       46
       46
        
       

     

       47
       47
        
       func Load(ctx context.Context) (*Config, error) {

appview/pages/templates/layouts/base.html

···

       14
       14
        
                   <link rel="preconnect" href="https://avatar.tangled.sh" />

     

       15
       15
        
                   <link rel="preconnect" href="https://camo.tangled.sh" />

     

       16
       16
        
       

     

       17
       17
       +
                   <!-- pwa manifest -->

     

       18
       18
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       19
       19
       +
       

     

       17
       20
        
                   <!-- preload main font -->

     

       18
       21
        
                   <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin />

     

       19
       22

appview/pages/templates/user/completeSignup.html

···

       20
       20
        
                       content="complete your signup for tangled"

     

       21
       21
        
                   />

     

       22
       22
        
                   <script src="/static/htmx.min.js"></script>

     

       23
       23
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       23
       24
        
                   <link

     

       24
       25
        
                       rel="stylesheet"

     

       25
       26
        
                       href="/static/tw.css?{{ cssContentHash }}"

appview/pages/templates/user/signup.html

···

       8
       8
        
                   <meta property="og:url" content="https://tangled.org/signup" />

     

       9
       9
        
                   <meta property="og:description" content="sign up for tangled" />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       11
       12
        
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

       12
       13
        
                   <title>sign up &middot; tangled</title>

     

       13
       14

+12 -1

appview/repo/index.go

···

       200
       200
        
       			})

     

       201
       201
        
       		}

     

       202
       202
        
       

     

       203
       203
       +
       		tx, err := rp.db.Begin()

     

       204
       204
       +
       		if err != nil {

     

       205
       205
       +
       			return nil, err

     

       206
       206
       +
       		}

     

       207
       207
       +
       		defer tx.Rollback()

     

       208
       208
       +
       

     

       203
       209
        
       		// update appview's cache

     

       204
       204
       -
       		err = db.InsertRepoLanguages(rp.db, langs)

     

       210
       210
       +
       		err = db.UpdateRepoLanguages(tx, f.RepoAt(), currentRef, langs)

     

       205
       211
        
       		if err != nil {

     

       206
       212
        
       			// non-fatal

     

       207
       213
        
       			log.Println("failed to cache lang results", err)

     

       208
       214
        
       		}

     

       215
       215
       +
       

     

       216
       216
       +
       		err = tx.Commit()

     

       217
       217
       +
       		if err != nil {

     

       218
       218
       +
       			return nil, err

     

       219
       219
       +
       		}

     

       209
       220
        
       	}

     

       210
       221
        
       

     

       211
       222
        
       	var total int64

Compare changes