From 395e31645063e11eac9995cb8635187b753f166d Mon Sep 17 00:00:00 2001
From: Nate Holland <natethedeveloper@gmail.com>
Date: Thu, 18 Nov 2021 13:38:35 -0600
Subject: [PATCH 1/2] :bug: Fix Verizon Straight Talk Conflict add MMS

Fixed conflict between Verizon and Straight Talk when configuring SMS notifications via Email. Added Verizon MMS option to resolve url clipping in SMS messages.
---
 server/index.html | 54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/server/index.html b/server/index.html
index 673b9b7..861748d 100644
--- a/server/index.html
+++ b/server/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<!-- 
+		<!--
             Designed and coded by:
             Prabhjot "Prince" Singh
-            https://github.com/Prince25/StockAlertBot 
+            https://github.com/Prince25/StockAlertBot
         -->
 		<title>StockAlertBot Settings</title>
 
@@ -422,7 +422,7 @@
 											</v-tooltip>
 										</div>
                                     </v-col>
-                                    
+
                                     <!--  Open URL, Desktop Notification HTML  -->
                                     <v-col md="6" class="ma-0 pa-3 pl-8 pr-8">
                                         <div style="display: flex; align-items: center; justify-content: center;">
@@ -435,7 +435,7 @@
                                                 </template>
                                                 <span>Opens the product url in your default browser when product is available.</span>
                                             </v-tooltip>
-                                            
+
                                             <v-checkbox class="mt-0 ml-8 pl-8" v-model="desktop_notification" label="Desktop Notification" @change="updateDesktop"></v-checkbox>
                                             <v-tooltip bottom>
                                                 <template v-slot:activator="{ on, attrs }">
@@ -458,7 +458,7 @@
                                         </div>
                                         <p class="text-right red--text" v-if="proxies">Make sure to put proxies (one proxy per line) in the file, "config/proxies.txt".<br>
                                             Format: ip:port or username:password@ip:port.<br>
-                                            Argos, Best Buy, Costco and Tesco do not currently work with proxies.</p> 
+                                            Argos, Best Buy, Costco and Tesco do not currently work with proxies.</p>
                                     </v-col>
                                 </v-row>
 
@@ -490,7 +490,7 @@
 										</div>
                                     </div>
                                 </div>
-                                
+
                                 <!--  Amazon HTML  -->
                                 <div v-if="has_amazon">
                                     <v-divider inset></v-divider>
@@ -617,9 +617,9 @@
 
                                 <div style="width: 100%;" class="mb-4" v-if="webhook_expanded">
                                     <webhooks
-                                        v-bind:webhook_urls="user_settings.WEBHOOK_URLS" 
-                                        v-on:remove_webhook_url="$emit('remove_webhook_url', $event)" 
-                                        v-on:add_webhook_url="$emit('add_webhook_url', $event)" 
+                                        v-bind:webhook_urls="user_settings.WEBHOOK_URLS"
+                                        v-on:remove_webhook_url="$emit('remove_webhook_url', $event)"
+                                        v-on:add_webhook_url="$emit('add_webhook_url', $event)"
                                     />
                                 </div>
 
@@ -634,8 +634,8 @@
 
                                 <div style="width: 100%;" class="mb-4" v-if="sms_expanded">
                                     <sms
-                                        v-bind:user_settings="user_settings" 
-                                        v-bind:env_settings="env_settings" 
+                                        v-bind:user_settings="user_settings"
+                                        v-bind:env_settings="env_settings"
                                         v-on:update_method="$emit('update_sms_method', $event)"
                                         v-on:update_aws_region="$emit('update_sms_aws_region', $event)"
                                         v-on:update_aws_key="$emit('update_sms_aws_key', $event)"
@@ -661,13 +661,13 @@
                                 </div>
 
                                 <div v-if="email" style="width: 100%;">
-                                    <email 
+                                    <email
                                         v-bind:settings="env_settings"
-                                        v-on:update_service="$emit('update_email_service', $event)" 
-                                        v-on:update_from="$emit('update_email_from', $event)" 
-                                        v-on:update_pass="$emit('update_email_pass', $event)" 
-                                        v-on:update_to="$emit('update_email_to', $event)" 
-                                        class="ma-4" 
+                                        v-on:update_service="$emit('update_email_service', $event)"
+                                        v-on:update_from="$emit('update_email_from', $event)"
+                                        v-on:update_pass="$emit('update_email_pass', $event)"
+                                        v-on:update_to="$emit('update_email_to', $event)"
+                                        class="ma-4"
                                     />
                                 </div>
 
@@ -929,38 +929,38 @@
 
                                 <!--  AWS SMS HTML  -->
                                 <div v-if="method === 'Amazon Web Services'" style="width: 100%;">
-                                    <aws-sms 
+                                    <aws-sms
                                         v-bind:settings="env_settings"
                                         v-on:update_region="$emit('update_aws_region', $event)"
                                         v-on:update_key="$emit('update_aws_key', $event)"
                                         v-on:update_secret="$emit('update_aws_secret', $event)"
-                                        v-on:update_phone="$emit('update_aws_phone', $event)" 
-                                        class="ma-4" 
+                                        v-on:update_phone="$emit('update_aws_phone', $event)"
+                                        class="ma-4"
                                     />
                                 </div>
 
                                 <!--  EMAIL SMS HTML  -->
                                 <div v-if="method === 'Email'" style="width: 100%;">
-                                    <email-sms 
+                                    <email-sms
                                         v-bind:settings="env_settings"
                                         v-on:update_service="$emit('update_service', $event)"
                                         v-on:update_from="$emit('update_from', $event)"
                                         v-on:update_pass="$emit('update_pass', $event)"
                                         v-on:update_carrier="$emit('update_carrier', $event)"
                                         v-on:update_phone="$emit('update_phone', $event)"
-                                        class="ma-4" 
+                                        class="ma-4"
                                     />
                                 </div>
 
                                 <!--  TWILIO SMS HTML  -->
                                 <div v-if="method === 'Twilio'" style="width: 100%;">
-                                    <twilio-sms 
+                                    <twilio-sms
                                         v-bind:settings="env_settings"
                                         v-on:update_sid="$emit('update_twilio_sid', $event)"
                                         v-on:update_auth="$emit('update_twilio_auth', $event)"
                                         v-on:update_from="$emit('update_twilio_from', $event)"
                                         v-on:update_to="$emit('update_twilio_to', $event)"
-                                        class="ma-4" 
+                                        class="ma-4"
                                     />
                                 </div>
                             </div>`,
@@ -1151,11 +1151,11 @@
 							"O2": "mmail.co.uk",
 							"Republic Wireless": "text.republicwireless.com",
 							"Sprint": "messaging.sprintpcs.com",
-							"Straight Talk": "vtext.com",
 							"T-Mobile": "tmomail.net",
 							"Ting": "message.ting.com",
 							"U.S. Cellular": "email.uscc.net",
-							"Verizon Wireless": "vtext.com",
+							"Verizon Wireless / Straight Talk": "vtext.com",
+							"Verizon Wireless MMS": "vzwpix.com",
 							"Virgin Mobile": "vmobl.com",
 							"Vodafone": "vodafone.net",
 						},
@@ -1243,7 +1243,7 @@
                                         <span>Carrier of the phone number.</span>
                                     </v-tooltip>
                                 </div>
-                                
+
                                 <!--  Phone HTML  -->
                                 <div style="display: flex; align-items: center; justify-content: center;">
                                     <p class="text-overline mb-5" style="font-size: 1rem!important;">Phone Number</p>

From b59b7678b6c2e8b7f86a2a2a9ddbfe7b1aecdc26 Mon Sep 17 00:00:00 2001
From: Nate Holland <natethedeveloper@gmail.com>
Date: Mon, 22 Nov 2021 11:35:21 -0600
Subject: [PATCH 2/2] :art: Add Additional Carrier MMS addresses

Added MMS addresses for more carriers. Consolidated ATT and FirstNet as well as Xfinity and Virgin Mobile to prevent config file read error. Trimmed stray closing > tag from Vue component template.
---
 server/index.html | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/server/index.html b/server/index.html
index 861748d..08fbc83 100644
--- a/server/index.html
+++ b/server/index.html
@@ -1141,23 +1141,28 @@
 						],
 						carriers: {
 							"Alltel": "sms.alltelwireless.com",
-							"AT&T": "txt.att.net",
+							"AT&T / FirstNet": "txt.att.net",
+							"AT&T MMS": "mms.att.net",
 							"Boost Mobile": "sms.myboostmobile.com",
-							"Cricket Wireless": "mms.cricketwireless.net",
+							"Boost Mobile MMS": "myboostmobile.com",
+							"Cricket Wireless": "sms.cricketwireless.net",
+							"Cricket Wireless MMS": "mms.cricketwireless.net",
 							"EE": "mms.ee.co.uk",
-							"FirstNet": "txt.att.net",
-							"Google Project Fi": "msg.fi.google.com",
-							"MetroPCS": "mymetropcs.com",
+							"Google Fi SMS & MMS": "msg.fi.google.com",
+							"MetroPCS SMS & MMS": "mymetropcs.com",
 							"O2": "mmail.co.uk",
 							"Republic Wireless": "text.republicwireless.com",
 							"Sprint": "messaging.sprintpcs.com",
-							"T-Mobile": "tmomail.net",
+							"Sprint MMS": "pm.sprint.com",
+							"T-Mobile SMS & MMS": "tmomail.net",
 							"Ting": "message.ting.com",
 							"U.S. Cellular": "email.uscc.net",
-							"Verizon Wireless / Straight Talk": "vtext.com",
+							"U.S. Cellular MMS": "mms.uscc.net",
+							"Verizon Wireless / Straight Talk / Xfinity Mobile": "vtext.com",
 							"Verizon Wireless MMS": "vzwpix.com",
 							"Virgin Mobile": "vmobl.com",
 							"Vodafone": "vodafone.net",
+              "Xfinity Mobile MMS / Virgin Mobile MMS": "mypixmessages.com",
 						},
 					};
 				},
@@ -1240,7 +1245,7 @@
                                                 <v-icon dark>mdi-help</v-icon>
                                             </v-btn>
                                         </template>
-                                        <span>Carrier of the phone number.</span>
+                                        <span>Carrier of the phone number. Default sending is SMS, some carriers support MMS as well, individual carrier rates may apply.</span>
                                     </v-tooltip>
                                 </div>
 
@@ -1258,7 +1263,7 @@
                                         </template>
                                         <span>Include area code (just digits, no special characters).</span>
                                     </v-tooltip>
-                                </div>>
+                                </div>
                             </div>`,
 			});
 
