Remove Twitch Social and Resolves #43

models/user.go

@@ -106,7 +106,6 @@ type User struct {
 	Linkedin      string
 	Github        string
 	Stackoverflow string
-	Twitch        string
 	Telegram      string
 	Codepen       string
 	Gitlab        string
@@ -552,7 +551,7 @@ func NewGhostUser() *User {
 }
 
 var (
-	reservedUsernames    = []string{"login", "join", "reset_password", "explore", "create", "assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", "pages", "about", "privacy", "faq", "tos", "brand", "contact", "heartbeat", "verified", "contribute", "status", "blog", "streamer", "brand", "jobs", "request", "certificate", "sponsors", "sponsorship", ".", ".."}
+	reservedUsernames    = []string{"login", "join", "reset_password", "explore", "create", "assets", "css", "img", "js", "less", "plugins", "debug", "raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new", "pages", "about", "privacy", "faq", "tos", "brand", "contact", "heartbeat", "verified", "contribute", "status", "blog", "brand", "jobs", "request", "certificate", "sponsors", "sponsorship", ".", ".."}
 	reservedUserPatterns = []string{"*.keys"}
 )
 

pkg/form/admin.go

@@ -44,7 +44,6 @@ type AdminEditUser struct {
 	Linkedin         string `binding:"MaxSize(50)"`
 	Github           string `binding:"MaxSize(50)"`
 	Stackoverflow    string `binding:"MaxSize(50)"`
-	Twitch           string `binding:"MaxSize(50)"`
 	Telegram         string `binding:"MaxSize(50)"`
 	Codepen          string `binding:"MaxSize(50)"`
 	Gitlab           string `binding:"MaxSize(50)"`

pkg/form/user.go

@@ -106,7 +106,6 @@ type UpdateSocial struct {
 	Linkedin      string `binding:"MaxSize(50)"`
 	Github        string `binding:"MaxSize(50)"`
 	Stackoverflow string `binding:"MaxSize(50)"`
-	Twitch        string `binding:"MaxSize(50)"`
 	Telegram      string `binding:"MaxSize(50)"`
 	Codepen       string `binding:"MaxSize(50)"`
 	Gitlab        string `binding:"MaxSize(50)"`

public/less/_user.less

@@ -158,26 +158,11 @@
 	}
 }
 
-.maker {
-	font-size: 16px;
-	color: #6435c9;
-}
-
-.streamer {
-	font-size: 16px;
-	color: #6441A4;
-}
-
 .isstaff {
 	font-size: 16px;
 	color: #f2711c;
 }
 
-.isintern {
-	font-size: 16px;
-	color: #242424;
-}
-
 .developer {
 	font-size: 16px;
 	color: #00bcd4;
@@ -188,17 +173,6 @@
 	color: #21ba45;
 }
 
-.bughunter {
-	font-size: 16px;
-	color: #ff0000;
-	margin-right: 2px;
-
-	&.bh-explore {
-		font-size: 13px;
-		margin-right: 3px;
-	}
-}
-
 .org-grid {
 	display: inline-block;
     margin-bottom: 3px;

routes/admin/users.go

@@ -237,7 +237,6 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	u.Linkedin = f.Linkedin
 	u.Github = f.Github
 	u.Stackoverflow = f.Stackoverflow
-	u.Twitch = f.Twitch
 	u.Telegram = f.Telegram
 	u.Codepen = f.Codepen
 	u.Gitlab = f.Gitlab

routes/user/setting.go

@@ -181,7 +181,6 @@ func SettingsSocial(c *context.Context) {
 	c.Data["linkedin"] = c.User.Linkedin
 	c.Data["github"] = c.User.Github
 	c.Data["stackoverflow"] = c.User.Stackoverflow
-	c.Data["twitch"] = c.User.Twitch
 	c.Data["telegram"] = c.User.Telegram
 	c.Data["codepen"] = c.User.Codepen
 	c.Data["gitlab"] = c.User.Gitlab
@@ -203,7 +202,6 @@ func SettingsSocialPost(c *context.Context, f form.UpdateSocial) {
 	c.User.Linkedin = f.Linkedin
 	c.User.Github = f.Github
 	c.User.Stackoverflow = f.Stackoverflow
-	c.User.Twitch = f.Twitch
 	c.User.Telegram = f.Telegram
 	c.User.Codepen = f.Codepen
 	c.User.Gitlab = f.Gitlab

templates/admin/user/edit.tmpl

@@ -92,10 +92,6 @@
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.User.Stackoverflow}}">
 						</div>
-						<div class="field {{if .Err_Twitch}}error{{end}}">
-							<label for="twitch">Twitch</label>
-							<input id="twitch" name="twitch" value="{{.User.Twitch}}">
-						</div>
 						<div class="field {{if .Err_Telegram}}error{{end}}">
 							<label for="telegram">Telegram</label>
 							<input id="telegram" name="telegram" value="{{.User.Telegram}}">

templates/admin/user/list.tmpl

@@ -36,7 +36,6 @@
 										</a>
 										<br/>
 										{{if .IsVerified}}<i class="admin-badge verified octicon octicon-verified"></i>{{end}}
-										{{if .Twitch}}<i class="admin-badge streamer octicon octicon-broadcast"></i>{{end}}
 										{{if .IsBeta}}<i class="admin-badge developer octicon octicon-circuit-board"></i>{{end}}
 										{{if .IsStaff}}<i class="admin-badge isstaff octicon octicon-tools"></i>{{end}}
 										{{if .GitoteDeveloper}}<i class="admin-badge gitotedeveloper octicon octicon-jersey"></i>{{end}}

templates/user/profile.tmpl

@@ -132,13 +132,12 @@
 									<p style="font-weight:500">{{.Owner.Status}}</p>
 								</li>
 							{{end}}
-							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Stackoverflow .Owner.Twitch .Owner.Telegram .Owner.Codepen}}
+							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Stackoverflow .Owner.Telegram .Owner.Codepen}}
 								<li class="ui center">
 									{{if .Owner.Twitter}}<a href="https://twitter.com/{{.Owner.Twitter}}" target="_blank"><i class="twitter icon"></i></a>{{end}}
 									{{if .Owner.Linkedin}}<a href="https://linkedin.com/in/{{.Owner.Linkedin}}" target="_blank"><i class="linkedin icon"></i></a>{{end}}
 									{{if .Owner.Github}}<a href="https://github.com/{{.Owner.Github}}" target="_blank"><i class="github icon"></i></a>{{end}}
 									{{if .Owner.Stackoverflow}}<a href="https://stackoverflow.com/users/{{.Owner.Stackoverflow}}" target="_blank"><i class="stack overflow icon"></i></a>{{end}}
-									{{if .Owner.Twitch}}<a href="https://www.twitch.tv/{{.Owner.Twitch}}" target="_blank"><i class="twitch icon"></i></a>{{end}}
 									{{if .Owner.Telegram}}<a href="https://t.me/{{.Owner.Telegram}}" target="_blank"><i class="telegram icon"></i></a>{{end}}
 									{{if .Owner.Codepen}}<a href="https://codepen.io/{{.Owner.Codepen}}" target="_blank"><i class="codepen icon"></i></a>{{end}}
 									{{if .Owner.Gitlab}}<a href="https://gitlab.com/{{.Owner.Gitlab}}" target="_blank"><i class="gitlab icon"></i></a>{{end}}
@@ -198,7 +197,7 @@
 									{{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}}
 								</a>
 							</li>
-							{{if or .Owner.GitoteDeveloper .Owner.IsBeta .Owner.Twitch}}
+							{{if or .Owner.GitoteDeveloper .Owner.IsBeta}}
 								<li>
 									<div class="ui tiny images">
 										{{if .Owner.GitoteDeveloper}}
@@ -211,11 +210,6 @@
 												<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/beta.png">
 											</a>
 										{{end}}
-										{{if .Owner.Twitch}}
-											<a class="poping up" target="_blank" href="/streamer" data-content="Streamer" data-variation="inverted tiny" data-position="left center">
-												<img class="ui image" src="https://gitote-cdn.netlify.com/img/badges/streamer.png">
-											</a>
-										{{end}}
 									</div>
 								</li>
 							{{end}}

templates/user/settings/social.tmpl

@@ -32,10 +32,6 @@
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.stackoverflow}}"  placeholder="id/username">
 						</div>
-						<div class="field">
-							<label for="twitch">Twitch</label>
-							<input id="twitch" name="twitch" value="{{.twitch}}"  placeholder="username">
-						</div>
 						<div class="field">
 							<label for="telegram">Telegram</label>
 							<input id="telegram" name="telegram" value="{{.telegram}}"  placeholder="username">