LiuFuhua / xj-marketing

Go to a project
Toggle navigation Toggle navigation pinning
liufuhua007
941c82e0 1 parent b63460b0

fix merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 6 deletions
......@@ -74,19 +74,15 @@ async def main():
elif args.platform == SOCIAL_MEDIA_KUAISHOU:
await ks_setup(str(account_file), handle=True)
elif args.platform == SOCIAL_MEDIA_WANGYIHAO:
<<<<<<< HEAD
await wyh_setup(str(account_file), handle=True, auto=False)
# elif args.platform == SOCIAL_MEDIA_XHS:
# await xhs_setup(str(account_file), handle=True)
=======
await wyh_setup(str(account_file), handle=True)
elif args.platform == SOCIAL_MEDIA_XHS:
await xhs_setup(str(account_file), handle=True)
>>>>>>> 137c8c81e73faaa366d86e49e291228c805236a3
elif args.platform == SOCIAL_MEDIA_TOUTIAO:
await toutiao_setup(str(account_file), handle=True, auto=False)
elif args.platform == SOCIAL_MEDIA_BAIJIAHAO:
<<<<<<< HEAD
await toutiao_setup(str(account_file), handle=True, auto=False)
elif args.action == 'auto_login':
......@@ -107,11 +103,9 @@ async def main():
await toutiao_setup(str(account_file), handle=True, auto=True)
elif args.platform == SOCIAL_MEDIA_BAIJIAHAO:
await toutiao_setup(str(account_file), handle=True, auto=True)
=======
await toutiao_setup(str(account_file), handle=True)
elif args.platform == SOCIAL_MEDIA_SOHU:
await sohu_setup(str(account_file), handle=True)
>>>>>>> 137c8c81e73faaa366d86e49e291228c805236a3
elif args.action == 'upload':
title, tags = get_title_and_hashtags(args.video_file)
......