Skip to content

Commit

Permalink
Merge branch 'dev' into feat/moderate-replies
Browse files Browse the repository at this point in the history
# Conflicts:
#	web/template/components/chat.gohtml
  • Loading branch information
MatthiasReumann committed Sep 7, 2023
2 parents dfbdb42 + 926c79a commit 36f0efc
Show file tree
Hide file tree
Showing 220 changed files with 932 additions and 694 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/deploy-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
tags:
- '*'

permissions:
packages: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -16,7 +19,7 @@ jobs:
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/joschahenningsen/tum-live/tum-live
images: ghcr.io/tum-dev/gocast/tum-live
tags: |
type=ref,event=branch
type=ref,event=pr
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/deploy-workers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
tags:
- '*'

permissions:
packages: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -24,7 +27,7 @@ jobs:
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/joschahenningsen/tum-live/${{ env.containername }}
images: ghcr.io/tum-dev/gocast/${{ env.containername }}
tags: |
type=sha
flavor: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ts-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
# The branches below must be a subset of the branches above
branches: [ dev ]

permissions:
packages: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -20,7 +23,7 @@ jobs:
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/joschahenningsen/tum-live/test-server
images: ghcr.io/tum-dev/gocast/test-server
tags: |
type=sha
flavor: |
Expand All @@ -46,7 +49,7 @@ jobs:
id: metaWorker
uses: docker/metadata-action@v4
with:
images: ghcr.io/joschahenningsen/tum-live/test-worker
images: ghcr.io/tum-dev/gocast/test-worker
tags: |
type=sha
flavor: |
Expand Down
2 changes: 1 addition & 1 deletion .idea/runConfigurations/TUM_Live__frontend__worker.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/run_tumlive_go.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"errors"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"gorm.io/gorm"
"net/http"
)
Expand Down
10 changes: 5 additions & 5 deletions api/audit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package api
import (
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"net/http"
"testing"
Expand Down
6 changes: 3 additions & 3 deletions api/bookmarks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"errors"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"gorm.io/gorm"
"net/http"
"strconv"
Expand Down
10 changes: 5 additions & 5 deletions api/bookmarks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"gorm.io/gorm"
"net/http"
Expand Down
8 changes: 4 additions & 4 deletions api/chat.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"gorm.io/gorm"

"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/realtime"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/realtime"

"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
Expand Down
10 changes: 5 additions & 5 deletions api/chat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"gorm.io/gorm"
)
Expand Down
6 changes: 3 additions & 3 deletions api/courseimport.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
campusonline "github.com/RBG-TUM/CAMPUSOnline"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/tum"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/tum"
uuid "github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
"html/template"
Expand Down
8 changes: 4 additions & 4 deletions api/courses.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/RBG-TUM/commons"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/tum"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/tum"
"github.com/meilisearch/meilisearch-go"
uuid "github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
Expand Down
10 changes: 5 additions & 5 deletions api/courses_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/dgraph-io/ristretto"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"github.com/u2takey/go-utils/uuid"
"gorm.io/gorm"
Expand Down
6 changes: 3 additions & 3 deletions api/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
log "github.com/sirupsen/logrus"
"net/http"
"os"
Expand Down
6 changes: 3 additions & 3 deletions api/download_ics.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
log "github.com/sirupsen/logrus"
"html/template"
"net/http"
Expand Down
10 changes: 5 additions & 5 deletions api/download_ics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"html/template"
"net/http"
Expand Down
10 changes: 5 additions & 5 deletions api/download_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"log"
"net/http"
Expand Down
6 changes: 3 additions & 3 deletions api/info-pages.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"net/http"
"strconv"
)
Expand Down
10 changes: 5 additions & 5 deletions api/info-pages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"github.com/Masterminds/sprig/v3"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"html/template"
"net/http"
Expand Down
6 changes: 3 additions & 3 deletions api/lecture_halls.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
log "github.com/sirupsen/logrus"
"net/http"
"strconv"
Expand Down
10 changes: 5 additions & 5 deletions api/lecture_halls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
campusonline "github.com/RBG-TUM/CAMPUSOnline"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"html/template"
"net/http"
Expand Down
10 changes: 5 additions & 5 deletions api/live_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"github.com/RBG-TUM/commons"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/realtime"
"github.com/joschahenningsen/TUM-Live/tools/tum"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/realtime"
"github.com/TUM-Dev/gocast/tools/tum"
log "github.com/sirupsen/logrus"
"sync"
)
Expand Down
6 changes: 3 additions & 3 deletions api/maintenance.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
log "github.com/sirupsen/logrus"
"net/http"
"strconv"
Expand Down
6 changes: 3 additions & 3 deletions api/notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"github.com/gin-gonic/gin"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
log "github.com/sirupsen/logrus"
"net/http"
"strconv"
Expand Down
10 changes: 5 additions & 5 deletions api/notifications_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/joschahenningsen/TUM-Live/dao"
"github.com/joschahenningsen/TUM-Live/mock_dao"
"github.com/joschahenningsen/TUM-Live/model"
"github.com/joschahenningsen/TUM-Live/tools"
"github.com/joschahenningsen/TUM-Live/tools/testutils"
"github.com/TUM-Dev/gocast/dao"
"github.com/TUM-Dev/gocast/mock_dao"
"github.com/TUM-Dev/gocast/model"
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/testutils"
"github.com/matthiasreumann/gomino"
"net/http"
"testing"
Expand Down
Loading

0 comments on commit 36f0efc

Please sign in to comment.