LogalDeveloper/owncast
0
Fork 0
Code Activity

Fixes #211: Update mod paths (#221)

Browse Source 
Co-authored-by: Michael Leow <mleow@moneylion.com>
This commit is contained in:
leowmjw
2020-10-05 10:07:09 -07:00
committed by GitHub
co-authored by Michael Leow
parent dfc03bc027
commit 769fc3a561
39 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"io/ioutil"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/utils"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)
controllers/admin/changeStreamKey.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/controllers"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/controllers"
log "github.com/sirupsen/logrus"
)
controllers/admin/disconnect.go
+3 -3
View File
@@ -3,10 +3,10 @@ package admin
import (
"net/http"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/core"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/core"
"github.com/gabek/owncast/core/rtmp"
"github.com/owncast/owncast/core/rtmp"
)
// DisconnectInboundConnection will force-disconnect an inbound stream
controllers/admin/hardware.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/metrics"
"github.com/owncast/owncast/metrics"
)
// GetHardwareStats will return hardware utilization over time
controllers/admin/inboundBroadcasterDetails.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
)
// GetInboundBroadasterDetails gets the details of the inbound broadcaster
controllers/admin/serverConfig.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
// GetServerConfig gets the config details of the server
controllers/admin/viewers.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/metrics"
"github.com/owncast/owncast/metrics"
)
// GetViewersOverTime will return the number of viewers at points in time
controllers/chat.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/router/middleware"
)
//GetChatMessages gets all of the chat messages
controllers/config.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/router/middleware"
)
//GetWebConfig gets the status of the server
controllers/controllers.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
)
type j map[string]interface{}
controllers/emoji.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"path/filepath"
"strings"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
log "github.com/sirupsen/logrus"
)
controllers/index.go
+4 -4
View File
@@ -11,10 +11,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/router/middleware"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/router/middleware"
"github.com/owncast/owncast/utils"
)
type MetadataPage struct {
controllers/status.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/router/middleware"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/router/middleware"
)
//GetStatus gets the status of the server
core/chat/chat.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"time"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
)
//Setup sets up the chat server
core/chat/client.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/teris-io/shortid"
)
core/chat/persistence.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"os"
"time"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
_ "github.com/mattn/go-sqlite3"
log "github.com/sirupsen/logrus"
)
core/chat/server.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
)
var (
core/chatListener.go
+2 -2
View File
@@ -3,8 +3,8 @@ package core
import (
"errors"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/models"
)
//ChatListenerImpl the implementation of the chat client
core/core.go
+6 -6
View File
@@ -9,12 +9,12 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/gabek/owncast/yp"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/owncast/owncast/yp"
)
var (
core/ffmpeg/ffmpeg.go
+1 -1
View File
@@ -1,7 +1,7 @@
package ffmpeg
import (
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
//ShowStreamOfflineState generates and shows the stream's offline state
core/ffmpeg/thumbnailGenerator.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
)
//StartThumbnailGenerator starts generating thumbnails
core/ffmpeg/transcoder.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/teris-io/shortid"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/utils"
)
var _commandExec *exec.Cmd
core/playlist/monitor.go
+3 -3
View File
@@ -12,9 +12,9 @@ import (
"github.com/radovskyb/watcher"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
var (
core/rtmp/rtmp.go
+5 -5
View File
@@ -14,11 +14,11 @@ import (
"github.com/nareix/joy5/format/flv/flvio"
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
"github.com/nareix/joy5/format/rtmp"
)
core/rtmp/utils.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"fmt"
"regexp"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/models"
"github.com/nareix/joy5/format/flv/flvio"
)
core/stats.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
const (
core/status.go
+4 -4
View File
@@ -3,10 +3,10 @@ package core
import (
"time"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/ffmpeg"
"github.com/gabek/owncast/models"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/ffmpeg"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/utils"
)
//GetStatus gets the status of the system
core/storage.go
+3 -3
View File
@@ -1,9 +1,9 @@
package core
import (
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core/playlist"
"github.com/gabek/owncast/core/storageproviders"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/playlist"
"github.com/owncast/owncast/core/storageproviders"
)
var (
core/storageproviders/s3Storage.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
)
//S3Storage is the s3 implementation of the ChunkStorageProvider
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/gabek/owncast
module github.com/owncast/owncast
go 1.14
main.go
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/core"
"github.com/gabek/owncast/metrics"
"github.com/gabek/owncast/router"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/metrics"
"github.com/owncast/owncast/router"
)
// the following are injected at build-time
metrics/viewers.go
+1 -1
View File
@@ -3,7 +3,7 @@ package metrics
import (
"time"
"github.com/gabek/owncast/core"
"github.com/owncast/owncast/core"
)
// How often we poll for updates
models/stats.go
+1 -1
View File
@@ -3,7 +3,7 @@ package models
import (
"time"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/utils"
)
//Stats holds the stats for the system
models/status.go
+1 -1
View File
@@ -1,6 +1,6 @@
package models
import "github.com/gabek/owncast/utils"
import "github.com/owncast/owncast/utils"
//Status represents the status of the system
type Status struct {
router/middleware/auth.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/subtle"
"net/http"
"github.com/gabek/owncast/config"
"github.com/owncast/owncast/config"
log "github.com/sirupsen/logrus"
)
router/router.go
+7 -7
View File
@@ -6,14 +6,14 @@ import (
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/controllers"
"github.com/gabek/owncast/controllers/admin"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/controllers"
"github.com/owncast/owncast/controllers/admin"
"github.com/gabek/owncast/core/chat"
"github.com/gabek/owncast/core/rtmp"
"github.com/gabek/owncast/router/middleware"
"github.com/gabek/owncast/yp"
"github.com/owncast/owncast/core/chat"
"github.com/owncast/owncast/core/rtmp"
"github.com/owncast/owncast/router/middleware"
"github.com/owncast/owncast/yp"
)
//Start starts the router for the http, ws, and rtmp
scripts/build.sh
+4 -4
View File
@@ -52,7 +52,7 @@ build() {
pushd dist/${NAME} >> /dev/null
CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/gabek/owncast
CGO_ENABLED=1 ~/go/bin/xgo --branch ${GIT_BRANCH} -ldflags "-s -w -X main.GitCommit=${GIT_COMMIT} -X main.BuildVersion=${VERSION} -X main.BuildType=${NAME}" -targets "${OS}/${ARCH}" github.com/owncast/owncast
mv owncast-*-${ARCH} owncast
zip -r -q -8 ../owncast-$NAME-$VERSION.zip .
@@ -76,7 +76,7 @@ git tag -a "v${VERSION}" -m "Release build v${VERSION}"
# On macOS open the Github page for new releases so they can be uploaded
if test -f "/usr/bin/open"; then
open "https://github.com/gabek/owncast/releases/new"
open "https://github.com/owncast/owncast/releases/new"
open dist
fi
@@ -90,8 +90,8 @@ cd $(git rev-parse --show-toplevel)
# Github Packages
docker build --build-arg NAME=docker --build-arg VERSION=${VERSION} --build-arg GIT_COMMIT=$GIT_COMMIT -t owncast . -f scripts/Dockerfile-build
docker tag $DOCKER_IMAGE docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION
docker push docker.pkg.github.com/gabek/owncast/$DOCKER_IMAGE:$VERSION
docker tag $DOCKER_IMAGE docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION
docker push docker.pkg.github.com/owncast/owncast/$DOCKER_IMAGE:$VERSION
#
# Dockerhub
# You must be authenticated via `docker login` with your Dockerhub credentials first.
yp/api.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/utils"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/utils"
)
type ypDetailsResponse struct {
yp/yp.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"encoding/json"
"github.com/gabek/owncast/config"
"github.com/gabek/owncast/models"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/models"
log "github.com/sirupsen/logrus"
)