mirror of
				https://github.com/DerTyp7/obs-twitch-camera-frame.git
				synced 2025-10-31 05:37:13 +01:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 53555aad6a | ||
|   | a4f9697b6c | ||
|   | c0d72b8e43 | ||
|   | 80ea3c297e | ||
|   | c5e597ef58 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1 +0,0 @@ | |||||||
| config.js |  | ||||||
| @@ -1,3 +1,4 @@ | |||||||
| const CONFIG = { | const CONFIG = { | ||||||
| 	apiKey: "", | 	apiKey: "", | ||||||
|  | 	twitchOAuth: "", | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -75,3 +75,12 @@ | |||||||
| 		background: var(--border-color-flash-1); | 		background: var(--border-color-flash-1); | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @keyframes tfBannerAnimation { | ||||||
|  | 	from { | ||||||
|  | 		margin-top: -200px; | ||||||
|  | 	} | ||||||
|  | 	to { | ||||||
|  | 		margin-top: 0px; | ||||||
|  | 	} | ||||||
|  | } | ||||||
|   | |||||||
| @@ -55,3 +55,27 @@ html { | |||||||
| 	animation-duration: 20s; | 	animation-duration: 20s; | ||||||
| 	animation-name: backgroundAnimation; | 	animation-name: backgroundAnimation; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | #teafire-banner { | ||||||
|  | 	height: 50px; | ||||||
|  | 	width: 180px; | ||||||
|  | 	padding: 20px; | ||||||
|  | 	margin-top: -200px; | ||||||
|  | 	z-index: 1; | ||||||
|  | 	animation-timing-function: linear; | ||||||
|  | 	float: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #teafire-banner p { | ||||||
|  | 	color: teal; | ||||||
|  | 	float: left; | ||||||
|  | 	font-size: 23pt; | ||||||
|  | 	font-weight: bolder; | ||||||
|  | 	padding-top: 8px; | ||||||
|  | 	padding-left: 5px; | ||||||
|  | } | ||||||
|  | #teafire-banner img { | ||||||
|  | 	color: teal; | ||||||
|  | 	height: 50px; | ||||||
|  | 	float: left; | ||||||
|  | } | ||||||
|   | |||||||
| @@ -11,6 +11,10 @@ | |||||||
| 	</head> | 	</head> | ||||||
| 	<body> | 	<body> | ||||||
| 		<div id="frame"></div> | 		<div id="frame"></div> | ||||||
|  | 		<div id="teafire-banner"> | ||||||
|  | 			<img src="img/logo128x128.png" alt="" /> | ||||||
|  | 			<p>TealFire</p> | ||||||
|  | 		</div> | ||||||
| 		<div id="subCount">0</div> | 		<div id="subCount">0</div> | ||||||
| 		<script src="config.js"></script> | 		<script src="config.js"></script> | ||||||
| 		<script src="js/socket.io.min.js"></script> | 		<script src="js/socket.io.min.js"></script> | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								img/logo128x128.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/logo128x128.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 7.7 KiB | 
							
								
								
									
										31
									
								
								js/app.js
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								js/app.js
									
									
									
									
									
								
							| @@ -1,5 +1,6 @@ | |||||||
| const subCount = document.getElementById("subCount"); | const subCount = document.getElementById("subCount"); | ||||||
| const frame = document.getElementById("frame"); | const frame = document.getElementById("frame"); | ||||||
|  | const tfBanner = document.getElementById("teafire-banner"); | ||||||
|  |  | ||||||
| let subCountNumber = 0; | let subCountNumber = 0; | ||||||
|  |  | ||||||
| @@ -33,4 +34,34 @@ function sub(subName) { | |||||||
| 		updateSubCount(); | 		updateSubCount(); | ||||||
| 	}, 11000); | 	}, 11000); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | function showTealFireBanner() { | ||||||
|  | 	tfBanner.style.animationName = "tfBannerAnimation"; | ||||||
|  | 	tfBanner.style.animationDuration = "3s"; | ||||||
|  | 	tfBanner.style.animationDirection = "normal"; | ||||||
|  | 	setTimeout(() => { | ||||||
|  | 		tfBanner.style.marginTop = "0px"; | ||||||
|  | 		tfBanner.style.animationName = ""; | ||||||
|  | 		tfBanner.style.animationDuration = ""; | ||||||
|  | 	}, 3000); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | function closeTealFireBanner() { | ||||||
|  | 	tfBanner.style.animationName = "tfBannerAnimation"; | ||||||
|  | 	tfBanner.style.animationDuration = "3s"; | ||||||
|  | 	tfBanner.style.animationDirection = "reverse"; | ||||||
|  |  | ||||||
|  | 	setTimeout(() => { | ||||||
|  | 		tfBanner.style.marginTop = "-200px"; | ||||||
|  | 		tfBanner.style.animationName = ""; | ||||||
|  | 		tfBanner.style.animationDuration = ""; | ||||||
|  | 	}, 3000); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | setInterval(() => { | ||||||
|  | 	showTealFireBanner(); | ||||||
|  | 	setTimeout(() => { | ||||||
|  | 		closeTealFireBanner(); | ||||||
|  | 	}, 20000); | ||||||
|  | }, 300000); | ||||||
| updateSubCount(); | updateSubCount(); | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ fetch("https://api.tipeeestream.com/v2.0/site/socket") | |||||||
| 				}); | 				}); | ||||||
| 			}); | 			}); | ||||||
| 			socket.on("new-event", (data) => { | 			socket.on("new-event", (data) => { | ||||||
|  | 				console.log(data); | ||||||
| 				if (data.event.type == "subscription") { | 				if (data.event.type == "subscription") { | ||||||
| 					sub(data.event.parameters.username); | 					sub(data.event.parameters.username); | ||||||
| 				} | 				} | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								update.ps1
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								update.ps1
									
									
									
									
									
								
							| @@ -32,7 +32,16 @@ if ($newestVersionString -ne "") { | |||||||
|   else { |   else { | ||||||
|     Write-Output "Updating to newer version..." |     Write-Output "Updating to newer version..." | ||||||
|  |  | ||||||
|     Remove-Item * -Recurse -Force -Confirm |     if (Test-Path "./config.js") { | ||||||
|  |       if (Test-Path "./config-old.js") { | ||||||
|  |         Remove-Item config-old.js | ||||||
|  |       } | ||||||
|  |       Copy-Item "./config.js" -Destination "./config-old.js" | ||||||
|  |       Write-Output "config.js has been copied" | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |      | ||||||
|  |     Remove-Item *  -Recurse -Force -Exclude config-old.js | ||||||
|  |  | ||||||
|     mkdir ./temp |     mkdir ./temp | ||||||
|     attrib +h ./temp |     attrib +h ./temp | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								update_force.bat
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								update_force.bat
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,2 @@ | |||||||
|  | powershell ./update_force.ps1 | ||||||
|  | pause | ||||||
							
								
								
									
										39
									
								
								update_force.ps1
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								update_force.ps1
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | |||||||
|  | Write-Output "Starting update..." | ||||||
|  |  | ||||||
|  | $newestVersionString = "" | ||||||
|  | $req = Invoke-WebRequest https://github.com/DerTyp876/obs-twitch-camera-frame/releases/latest | ||||||
|  |  | ||||||
|  | foreach ($tag in $req.ParsedHtml.body.getElementsByTagName('h1')) { | ||||||
|  |   if ($tag.innerText[0] -eq "v") { | ||||||
|  |     $newestVersionString = $tag.innerText | ||||||
|  |   } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | Write-Output "Updating to newer version..." | ||||||
|  |  | ||||||
|  | if (Test-Path "./config.js") { | ||||||
|  |   if (Test-Path "./config-old.js") { | ||||||
|  |     Remove-Item config-old.js | ||||||
|  |   } | ||||||
|  |   Copy-Item "./config.js" -Destination "./config-old.js" | ||||||
|  |   Write-Output "config.js has been copied" | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | Remove-Item *  -Recurse -Force -Exclude config-old.js | ||||||
|  |  | ||||||
|  | mkdir ./temp | ||||||
|  | attrib +h ./temp | ||||||
|  | Write-Output "Downloading newer version..." | ||||||
|  | Invoke-WebRequest -Uri "https://github.com/DerTyp876/obs-twitch-camera-frame/archive/refs/tags/$newestVersionString.zip" -OutFile "./temp/$newestVersionString.zip" | ||||||
|  | Write-Output "Extracting archive..." | ||||||
|  | Expand-Archive -Path "./temp/$newestVersionString.zip" -DestinationPath "./temp/" | ||||||
|  |  | ||||||
|  | Get-ChildItem -Path "./temp/obs-twitch-camera-frame-$($newestVersionString -replace 'v')" -Recurse | Move-Item -Destination "./" | ||||||
|  |  | ||||||
|  | Remove-Item "./temp" -Recurse -Force -Confirm | ||||||
|  |  | ||||||
|  | Write-Output "You are now up to date again!" | ||||||
|  |  | ||||||
|  | Write-Output "You need to add your API-Key again to the config.js!" | ||||||
|  | pause | ||||||
		Reference in New Issue
	
	Block a user