Skip to content

Commit 1d5d1dc

Browse files
maxkahanmaxkahan
committed
update more snippets
1 parent 7a2bda8 commit 1d5d1dc

29 files changed

+172
-143
lines changed

Diff for: ‎messages/messenger/send-audio.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1313
MESSAGES_AUDIO_URL = os.environ.get("MESSAGES_AUDIO_URL")
1414

15-
from vonage import Auth, HttpClientOptions, Vonage
15+
from vonage import Auth, Vonage
1616
from vonage_messages import MessengerAudio, MessengerResource
1717

1818
client = Vonage(
1919
Auth(
2020
application_id=VONAGE_APPLICATION_ID,
2121
private_key=VONAGE_PRIVATE_KEY,
22-
),
23-
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
22+
)
2423
)
2524

2625
message = MessengerAudio(

Diff for: ‎messages/messenger/send-file.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1313
MESSAGES_FILE_URL = os.environ.get("MESSAGES_FILE_URL")
1414

15-
from vonage import Auth, HttpClientOptions, Vonage
15+
from vonage import Auth, Vonage
1616
from vonage_messages import MessengerFile, MessengerResource
1717

1818
client = Vonage(
1919
Auth(
2020
application_id=VONAGE_APPLICATION_ID,
2121
private_key=VONAGE_PRIVATE_KEY,
22-
),
23-
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
22+
)
2423
)
2524

2625
message = MessengerFile(

Diff for: ‎messages/messenger/send-text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
1212
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1313

14-
from vonage import Auth, HttpClientOptions, Vonage
14+
from vonage import Auth, Vonage
1515
from vonage_messages import MessengerText
1616

1717
client = Vonage(

Diff for: ‎messages/messenger/send-video.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1212
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
1313

14-
from vonage import Auth, HttpClientOptions, Vonage
14+
from vonage import Auth, Vonage
1515
from vonage_messages import MessengerVideo, MessengerResource
1616

1717
client = Vonage(
1818
Auth(
1919
application_id=VONAGE_APPLICATION_ID,
2020
private_key=VONAGE_PRIVATE_KEY,
21-
),
22-
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
21+
)
2322
)
2423

2524
message = MessengerVideo(

Diff for: ‎messages/rcs/revoke-message.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
GEOSPECIFIC_VONAGE_API_HOST = os.environ.get("GEOSPECIFIC_VONAGE_API_HOST")
1111
MESSAGES_MESSAGE_ID = os.environ.get("MESSAGES_MESSAGE_ID")
1212

13-
from vonage import Auth, HttpClientOptions, Vonage
13+
from vonage import Auth, Vonage
1414

1515
client = Vonage(
1616
auth=Auth(
1717
application_id=VONAGE_APPLICATION_ID,
1818
private_key=VONAGE_PRIVATE_KEY,
19-
),
20-
http_client_options=HttpClientOptions(api_host=GEOSPECIFIC_VONAGE_API_HOST),
19+
)
2120
)
2221

2322
response = client.messages.revoke_rcs_message(MESSAGES_MESSAGE_ID)

Diff for: ‎messages/sandbox/messenger/send_text.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
from os.path import join, dirname
33
from dotenv import load_dotenv
44

5-
dotenv_path = join(dirname(__file__), "../../.env")
5+
dotenv_path = join(dirname(__file__), "../../../.env")
66
load_dotenv(dotenv_path)
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
MESSAGES_SANDBOX_URL = os.environ.get("MESSAGES_SANDBOX_URL")
12-
MESSAGES_SANDBOX_FB_ID = os.environ.get("MESSAGES_SANDBOX_FB_ID")
13-
MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID = os.environ.get(
14-
"MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID"
15-
)
11+
MESSAGES_SANDBOX_HOST = os.environ.get("MESSAGES_SANDBOX_HOST")
12+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
13+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1614

1715
from vonage import Auth, HttpClientOptions, Vonage
1816
from vonage_messages import MessengerText
@@ -22,12 +20,12 @@
2220
application_id=VONAGE_APPLICATION_ID,
2321
private_key=VONAGE_PRIVATE_KEY,
2422
),
25-
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_URL),
23+
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_HOST),
2624
)
2725

2826
message = MessengerText(
29-
to=MESSAGES_SANDBOX_ALLOW_LISTED_FB_RECIPIENT_ID,
30-
from_=MESSAGES_SANDBOX_FB_ID,
27+
to=MESSENGER_RECIPIENT_ID,
28+
from_=MESSENGER_SENDER_ID,
3129
text="This is a Facebook Messenger text message sent using the Vonage Messages API via the Messages Sandbox",
3230
)
3331

Diff for: ‎messages/sandbox/viber/send_text.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
from os.path import join, dirname
33
from dotenv import load_dotenv
44

5-
dotenv_path = join(dirname(__file__), "../../.env")
5+
dotenv_path = join(dirname(__file__), "../../../.env")
66
load_dotenv(dotenv_path)
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
MESSAGES_SANDBOX_URL = os.environ.get("MESSAGES_SANDBOX_URL")
12-
MESSAGES_SANDBOX_VIBER_SERVICE_ID = os.environ.get("MESSAGES_SANDBOX_VIBER_SERVICE_ID")
13-
MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER = os.environ.get(
14-
"MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER"
15-
)
11+
MESSAGES_SANDBOX_HOST = os.environ.get("MESSAGES_SANDBOX_HOST")
12+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
13+
VIBER_SENDER_ID = os.environ.get("VIBER_SENDER_ID")
1614

1715
from vonage import Auth, HttpClientOptions, Vonage
1816
from vonage_messages import ViberText
@@ -22,12 +20,12 @@
2220
application_id=VONAGE_APPLICATION_ID,
2321
private_key=VONAGE_PRIVATE_KEY,
2422
),
25-
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_URL),
23+
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_HOST),
2624
)
2725

2826
message = ViberText(
29-
to=MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER,
30-
from_=MESSAGES_SANDBOX_VIBER_SERVICE_ID,
27+
to=MESSAGES_TO_NUMBER,
28+
from_=VIBER_SENDER_ID,
3129
text="This is a Viber Service Message text message sent using the Messages API via the Messages Sandbox",
3230
)
3331

Diff for: ‎messages/sandbox/whatsapp/send_text.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
from os.path import join, dirname
33
from dotenv import load_dotenv
44

5-
dotenv_path = join(dirname(__file__), "../../.env")
5+
dotenv_path = join(dirname(__file__), "../../../.env")
66
load_dotenv(dotenv_path)
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
MESSAGES_SANDBOX_URL = os.environ.get("MESSAGES_SANDBOX_URL")
12-
MESSAGES_SANDBOX_WHATSAPP_NUMBER = os.environ.get("MESSAGES_SANDBOX_WHATSAPP_NUMBER")
13-
MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER = os.environ.get(
14-
"MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER"
15-
)
11+
MESSAGES_SANDBOX_HOST = os.environ.get("MESSAGES_SANDBOX_HOST")
12+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
13+
WHATSAPP_SENDER_ID = os.environ.get("WHATSAPP_SENDER_ID")
1614

1715
from vonage import Auth, HttpClientOptions, Vonage
1816
from vonage_messages import WhatsappText
@@ -22,12 +20,12 @@
2220
application_id=VONAGE_APPLICATION_ID,
2321
private_key=VONAGE_PRIVATE_KEY,
2422
),
25-
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_URL),
23+
http_client_options=HttpClientOptions(api_host=MESSAGES_SANDBOX_HOST),
2624
)
2725

2826
message = WhatsappText(
29-
to=MESSAGES_SANDBOX_ALLOW_LISTED_TO_NUMBER,
30-
from_=MESSAGES_SANDBOX_WHATSAPP_NUMBER,
27+
to=MESSAGES_TO_NUMBER,
28+
from_=WHATSAPP_SENDER_ID,
3129
text="This is a WhatsApp text message sent using the Vonage Messages API via the Messages Sandbox",
3230
)
3331

Diff for: ‎messages/viber/send-file.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
TO_NUMBER = os.environ.get("TO_NUMBER")
11-
VIBER_SERVICE_MESSAGE_ID = os.environ.get("VIBER_SERVICE_MESSAGE_ID")
12-
FILE_URL = os.environ.get("FILE_URL")
10+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
11+
VIBER_SENDER_ID = os.environ.get("VIBER_SENDER_ID")
12+
MESSAGES_FILE_URL = os.environ.get("MESSAGES_FILE_URL")
1313

1414
from vonage import Auth, Vonage
1515
from vonage_messages import ViberFile, ViberFileResource
@@ -22,9 +22,9 @@
2222
)
2323

2424
message = ViberFile(
25-
to=TO_NUMBER,
26-
from_=VIBER_SERVICE_MESSAGE_ID,
27-
file=ViberFileResource(url=FILE_URL),
25+
to=MESSAGES_TO_NUMBER,
26+
from_=VIBER_SENDER_ID,
27+
file=ViberFileResource(url=MESSAGES_FILE_URL),
2828
)
2929

3030
response = client.messages.send(message)

Diff for: ‎messages/viber/send-image.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
TO_NUMBER = os.environ.get("TO_NUMBER")
11-
VIBER_SERVICE_MESSAGE_ID = os.environ.get("VIBER_SERVICE_MESSAGE_ID")
12-
IMAGE_URL = os.environ.get("IMAGE_URL")
10+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
11+
VIBER_SENDER_ID = os.environ.get("VIBER_SENDER_ID")
12+
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
1313

1414
from vonage import Auth, Vonage
1515
from vonage_messages import ViberImage, ViberImageResource
@@ -22,9 +22,9 @@
2222
)
2323

2424
message = ViberImage(
25-
to=TO_NUMBER,
26-
from_=VIBER_SERVICE_MESSAGE_ID,
27-
image=ViberImageResource(url=IMAGE_URL),
25+
to=MESSAGES_TO_NUMBER,
26+
from_=VIBER_SENDER_ID,
27+
image=ViberImageResource(url=MESSAGES_IMAGE_URL),
2828
)
2929

3030
response = client.messages.send(message)

Diff for: ‎messages/viber/send-text.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
TO_NUMBER = os.environ.get("TO_NUMBER")
11-
VIBER_SERVICE_MESSAGE_ID = os.environ.get("VIBER_SERVICE_MESSAGE_ID")
10+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
11+
VIBER_SENDER_ID = os.environ.get("VIBER_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
1414
from vonage_messages import ViberText
@@ -21,8 +21,8 @@
2121
)
2222

2323
message = ViberText(
24-
to=TO_NUMBER,
25-
from_=VIBER_SERVICE_MESSAGE_ID,
24+
to=MESSAGES_TO_NUMBER,
25+
from_=VIBER_SENDER_ID,
2626
text="This is a Viber message sent via the Vonage Messages API.",
2727
)
2828

Diff for: ‎messages/viber/send-video.py

+14-7
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
TO_NUMBER = os.environ.get("TO_NUMBER")
11-
VIBER_SERVICE_MESSAGE_ID = os.environ.get("VIBER_SERVICE_MESSAGE_ID")
12-
VIDEO_URL = os.environ.get("VIDEO_URL")
10+
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
11+
VIBER_SENDER_ID = os.environ.get("VIBER_SENDER_ID")
12+
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
13+
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
14+
MESSAGES_VIDEO_DURATION = os.environ.get("MESSAGES_VIDEO_DURATION")
15+
MESSAGES_VIDEO_FILE_SIZE = os.environ.get("MESSAGES_VIDEO_FILE_SIZE")
1316

1417
from vonage import Auth, Vonage
15-
from vonage_messages import ViberVideo, ViberVideoResource
18+
from vonage_messages import ViberVideo, ViberVideoOptions, ViberVideoResource
1619

1720
client = Vonage(
1821
Auth(
@@ -22,9 +25,13 @@
2225
)
2326

2427
message = ViberVideo(
25-
to=TO_NUMBER,
26-
from_=VIBER_SERVICE_MESSAGE_ID,
27-
video=ViberVideoResource(url=VIDEO_URL),
28+
to=MESSAGES_TO_NUMBER,
29+
from_=VIBER_SENDER_ID,
30+
video=ViberVideoResource(url=MESSAGES_VIDEO_URL, thumb_url=MESSAGES_IMAGE_URL),
31+
viber_service=ViberVideoOptions(
32+
duration=MESSAGES_VIDEO_DURATION,
33+
file_size=MESSAGES_VIDEO_FILE_SIZE,
34+
),
2835
)
2936

3037
response = client.messages.send(message)

Diff for: ‎messages/whatsapp/mark-as-read.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
GEOSPECIFIC_VONAGE_API_HOST = os.environ.get("GEOSPECIFIC_VONAGE_API_HOST")
11-
MESSAGE_UUID = os.environ.get("MESSAGE_UUID")
10+
GEOSPECIFIC_MESSAGES_API_URL = os.environ.get("GEOSPECIFIC_MESSAGES_API_URL")
11+
MESSAGES_MESSAGE_ID = os.environ.get("MESSAGES_MESSAGE_ID")
1212

1313
from vonage import Auth, HttpClientOptions, Vonage
1414

@@ -17,7 +17,7 @@
1717
application_id=VONAGE_APPLICATION_ID,
1818
private_key=VONAGE_PRIVATE_KEY,
1919
),
20-
http_client_options=HttpClientOptions(api_host=GEOSPECIFIC_VONAGE_API_HOST),
20+
http_client_options=HttpClientOptions(api_host=GEOSPECIFIC_MESSAGES_API_URL),
2121
)
2222

23-
client.messages.mark_whatsapp_message_read("MESSAGE_UUID")
23+
client.messages.mark_whatsapp_message_read("MESSAGES_MESSAGE_ID")

Diff for: ‎messages/whatsapp/send-authentication-template.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010
MESSAGES_TO_NUMBER = os.environ.get("MESSAGES_TO_NUMBER")
1111
WHATSAPP_SENDER_ID = os.environ.get("WHATSAPP_SENDER_ID")
12-
WHATSAPP_AUTH_TEMPLATE_NAME = os.environ.get("WHATSAPP_AUTH_TEMPLATE_NAME")
12+
WHATSAPP_TEMPLATE_NAME = os.environ.get("WHATSAPP_TEMPLATE_NAME")
13+
WHATSAPP_OTP = os.environ.get("WHATSAPP_OTP")
1314

14-
from vonage import Auth, Vonage
15+
from vonage import Auth, HttpClientOptions, Vonage
1516
from vonage_messages import WhatsappCustom
1617

1718
client = Vonage(
1819
Auth(
1920
application_id=VONAGE_APPLICATION_ID,
2021
private_key=VONAGE_PRIVATE_KEY,
21-
)
22+
),
23+
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
2224
)
2325

2426
message = WhatsappCustom(
@@ -27,15 +29,15 @@
2729
custom={
2830
"type": "template",
2931
"template": {
30-
"name": WHATSAPP_AUTH_TEMPLATE_NAME,
32+
"name": WHATSAPP_TEMPLATE_NAME,
3133
"language": {"policy": "deterministic", "code": "en"},
3234
"components": [
3335
{"type": "body", "parameters": [{"type": "text", "text": "'$OTP'"}]},
3436
{
3537
"type": "button",
3638
"sub_type": "url",
3739
"index": "0",
38-
"parameters": [{"type": "text", "text": "'$OTP'"}],
40+
"parameters": [{"type": "text", "text": WHATSAPP_OTP}],
3941
},
4042
],
4143
},

0 commit comments

Comments
 (0)